From 199fabda72956faf3f83db20eab61618be5fefef Mon Sep 17 00:00:00 2001
From: tim <tim@treehouse.org.za>
Date: Tue, 6 Sep 2022 15:23:44 +0200
Subject: [PATCH] Update routes and add water tables

---
 GIS Base Map/Gun Run.qgs        | 28060 ++++++++++++++---------------
 GIS Base Map/Gun Run.qgs.mldata |   Bin 13922 -> 14621 bytes
 GIS Base Map/Gun Run.qgs~       | 28062 +++++++++++++++---------------
 GIS Base Map/all_routes.dbf     |   Bin 2850 -> 2850 bytes
 GIS Base Map/all_routes.shp     |   Bin 17940 -> 19300 bytes
 GIS Base Map/all_routes.shx     |   Bin 132 -> 132 bytes
 GIS Base Map/water_tables.dbf   |   Bin 890 -> 901 bytes
 GIS Base Map/water_tables.shp   |   Bin 1204 -> 1052 bytes
 GIS Base Map/water_tables.shx   |   Bin 164 -> 156 bytes
 9 files changed, 28151 insertions(+), 27971 deletions(-)

diff --git a/GIS Base Map/Gun Run.qgs b/GIS Base Map/Gun Run.qgs
index 73bff76..587943c 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 version="3.26.2-Buenos Aires" projectname="Gun Run" saveUserFull="Timothy Allen" saveDateTime="2022-09-04T18:41:34" saveUser="tim">
+<qgis saveUser="tim" saveDateTime="2022-09-06T15:22:52" version="3.26.2-Buenos Aires" saveUserFull="Timothy Allen" projectname="Gun Run">
   <homePath path=""/>
   <title>Gun Run</title>
   <transaction mode="Disabled"/>
@@ -21,215 +21,215 @@
     <customproperties>
       <Option/>
     </customproperties>
-    <layer-tree-group checked="Qt::Unchecked" name="Marshals" groupLayer="" expanded="1">
+    <layer-tree-group expanded="1" groupLayer="" checked="Qt::Unchecked" name="Marshals">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer checked="Qt::Unchecked" legend_exp="" source="./marshal_positions.shp|layername=marshal_positions" name="marshal_positions" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" providerKey="ogr" legend_split_behavior="0" patch_size="0,0" expanded="1">
+      <layer-tree-layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" expanded="1" legend_split_behavior="0" source="./marshal_positions.shp|layername=marshal_positions" legend_exp="" providerKey="ogr" patch_size="0,0" checked="Qt::Unchecked" name="marshal_positions">
         <customproperties>
           <Option type="Map">
-            <Option value="marshal_positions" type="QString" name="cached_name"/>
+            <Option type="QString" value="marshal_positions" name="cached_name"/>
             <Option type="invalid" name="expandedLegendNodes"/>
-            <Option value="" type="QString" name="legend/expressionFilter"/>
-            <Option value="false" type="QString" name="legend/expressionFilterEnabled"/>
-            <Option value="1" type="int" name="showFeatureCount"/>
+            <Option type="QString" value="" name="legend/expressionFilter"/>
+            <Option type="QString" value="false" name="legend/expressionFilterEnabled"/>
+            <Option type="int" value="1" name="showFeatureCount"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer checked="Qt::Unchecked" legend_exp="" source="./extra_security.shp" name="extra_security" id="extra_security20170921130834191" providerKey="ogr" legend_split_behavior="0" patch_size="0,0" expanded="1">
+      <layer-tree-layer id="extra_security20170921130834191" expanded="1" legend_split_behavior="0" source="./extra_security.shp" legend_exp="" providerKey="ogr" patch_size="0,0" checked="Qt::Unchecked" name="extra_security">
         <customproperties>
           <Option type="Map">
             <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer checked="Qt::Unchecked" legend_exp="" source="./marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes" name="marshals_by_position" id="marshals_by_position20161003112326575" providerKey="delimitedtext" legend_split_behavior="0" patch_size="0,0" expanded="1">
+      <layer-tree-layer id="marshals_by_position20161003112326575" expanded="1" legend_split_behavior="0" source="./marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes" legend_exp="" providerKey="delimitedtext" patch_size="0,0" checked="Qt::Unchecked" name="marshals_by_position">
         <customproperties>
           <Option type="Map">
-            <Option value="marshals_by_position" type="QString" name="cached_name"/>
+            <Option type="QString" value="marshals_by_position" name="cached_name"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer checked="Qt::Unchecked" legend_exp="" source="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" name="complete_marshal_overview" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" providerKey="virtual" legend_split_behavior="0" patch_size="0,0" expanded="1">
+      <layer-tree-layer id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" expanded="1" legend_split_behavior="0" source="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" legend_exp="" providerKey="virtual" patch_size="0,0" checked="Qt::Unchecked" name="complete_marshal_overview">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer checked="Qt::Unchecked" legend_exp="" source="./marshal overviews.shp|layername=marshal overviews" name="marshal_overviews" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" providerKey="ogr" legend_split_behavior="0" patch_size="0,0" expanded="0">
+      <layer-tree-layer id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" expanded="0" legend_split_behavior="0" source="./marshal overviews.shp|layername=marshal overviews" legend_exp="" providerKey="ogr" patch_size="0,0" checked="Qt::Unchecked" name="marshal_overviews">
         <customproperties>
           <Option type="Map">
-            <Option value="" type="QString" name="legend/expressionFilter"/>
-            <Option value="false" type="QString" name="legend/expressionFilterEnabled"/>
+            <Option type="QString" value="" name="legend/expressionFilter"/>
+            <Option type="QString" value="false" name="legend/expressionFilterEnabled"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group checked="Qt::Unchecked" name="Fencing and Cones" groupLayer="" expanded="1">
+    <layer-tree-group expanded="1" groupLayer="" checked="Qt::Unchecked" name="Fencing and Cones">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer checked="Qt::Unchecked" legend_exp="" source="./fencing.shp|layername=fencing" name="fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" providerKey="ogr" legend_split_behavior="0" patch_size="0,0" expanded="1">
+      <layer-tree-layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" expanded="1" legend_split_behavior="0" source="./fencing.shp|layername=fencing" legend_exp="" providerKey="ogr" patch_size="0,0" checked="Qt::Unchecked" name="fencing">
         <customproperties>
           <Option type="Map">
-            <Option value="fencing" type="QString" name="cached_name"/>
-            <Option value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" type="QString" name="expandedLegendNodes"/>
-            <Option value="" type="QString" name="legend/expressionFilter"/>
-            <Option value="false" type="QString" name="legend/expressionFilterEnabled"/>
+            <Option type="QString" value="fencing" name="cached_name"/>
+            <Option type="QString" value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" name="expandedLegendNodes"/>
+            <Option type="QString" value="" name="legend/expressionFilter"/>
+            <Option type="QString" value="false" name="legend/expressionFilterEnabled"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer checked="Qt::Unchecked" legend_exp="" source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20SUM(cone_len)%20AS%20[cone_len],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22" name="fence_groups" id="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792" providerKey="virtual" legend_split_behavior="0" patch_size="0,0" expanded="1">
+      <layer-tree-layer id="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792" expanded="1" legend_split_behavior="0" source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20SUM(cone_len)%20AS%20[cone_len],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22" legend_exp="" providerKey="virtual" patch_size="0,0" checked="Qt::Unchecked" name="fence_groups">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group checked="Qt::Checked" name="Routes" groupLayer="" expanded="1">
+    <layer-tree-group expanded="1" groupLayer="" checked="Qt::Checked" name="Routes">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-group checked="Qt::Checked" name="Markers" groupLayer="" expanded="1">
+      <layer-tree-group expanded="1" groupLayer="" checked="Qt::Checked" name="Markers">
         <customproperties>
           <Option/>
         </customproperties>
-        <layer-tree-layer checked="Qt::Unchecked" legend_exp="" source="Point?crs=EPSG:4326&amp;uid={05790416-d753-49b1-9e87-b3ddb34a215c}" name="route_markers" id="route_markers_d58f7174_b6d0_4e1c_80ed_0d74635b8ca6" providerKey="memory" legend_split_behavior="0" patch_size="-1,-1" expanded="1">
+        <layer-tree-layer id="route_markers_4e92bf25_f500_4b5f_bf49_9dd0b475a0c9" expanded="1" legend_split_behavior="0" source="Point?crs=EPSG:4326&amp;uid={4808c362-f7ac-4282-ac6f-84be4cb842e6}" legend_exp="" providerKey="memory" patch_size="-1,-1" checked="Qt::Checked" name="route_markers">
           <customproperties>
             <Option type="Map">
-              <Option value="1" type="int" name="showFeatureCount"/>
+              <Option type="int" value="1" name="showFeatureCount"/>
             </Option>
           </customproperties>
         </layer-tree-layer>
       </layer-tree-group>
-      <layer-tree-layer checked="Qt::Checked" legend_exp="" source="./all_routes.shp|layername=all_routes" name="all_routes" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" providerKey="ogr" legend_split_behavior="0" patch_size="0,0" expanded="1">
+      <layer-tree-layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" expanded="1" legend_split_behavior="0" source="./all_routes.shp|layername=all_routes" legend_exp="" providerKey="ogr" patch_size="0,0" checked="Qt::Checked" name="all_routes">
         <customproperties>
           <Option type="Map">
-            <Option value="all_routes" type="QString" name="cached_name"/>
-            <Option name="expandedLegendNodes"/>
-            <Option value="0" type="int" name="showFeatureCount"/>
+            <Option type="QString" value="all_routes" name="cached_name"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
+            <Option type="int" value="0" name="showFeatureCount"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-layer checked="Qt::Unchecked" legend_exp="" source="./timelapse.shp|layername=timelapse|subset=&quot;first_runn&quot; &lt; '06:59:45.000000' AND &quot;last_runne&quot; >= '06:59:35.000000' " name="timelapse" id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" providerKey="ogr" legend_split_behavior="0" patch_size="0,0" expanded="0">
+    <layer-tree-layer id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" expanded="0" legend_split_behavior="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' " legend_exp="" providerKey="ogr" patch_size="0,0" checked="Qt::Unchecked" name="timelapse">
       <customproperties>
         <Option type="Map">
-          <Option value="timelapse" type="QString" name="cached_name"/>
+          <Option type="QString" value="timelapse" name="cached_name"/>
         </Option>
       </customproperties>
     </layer-tree-layer>
-    <layer-tree-group checked="Qt::Checked" name="Feeding Stations" groupLayer="" expanded="1">
+    <layer-tree-group expanded="1" groupLayer="" checked="Qt::Checked" name="Feeding Stations">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer checked="Qt::Unchecked" legend_exp="" source="./water_tables.shp" name="water_tables" id="water_tables20170921142016467" providerKey="ogr" legend_split_behavior="0" patch_size="0,0" expanded="1">
+      <layer-tree-layer id="water_tables20170921142016467" expanded="1" legend_split_behavior="0" source="./water_tables.shp" legend_exp="" providerKey="ogr" patch_size="0,0" checked="Qt::Checked" name="water_tables">
         <customproperties>
           <Option type="Map">
-            <Option value="water_tables" type="QString" name="cached_name"/>
-            <Option name="expandedLegendNodes"/>
-          </Option>
-        </customproperties>
-      </layer-tree-layer>
-    </layer-tree-group>
-    <layer-tree-group checked="Qt::Unchecked" name="Ask Me" groupLayer="" expanded="0">
-      <customproperties>
-        <Option/>
-      </customproperties>
-      <layer-tree-layer checked="Qt::Unchecked" legend_exp="" source="./poi_labels.shp|layername=poi_labels" name="poi_labels" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" providerKey="ogr" legend_split_behavior="0" patch_size="0,0" expanded="1">
-        <customproperties>
-          <Option type="Map">
-            <Option value="poi_labels" type="QString" name="cached_name"/>
-          </Option>
-        </customproperties>
-      </layer-tree-layer>
-      <layer-tree-layer checked="Qt::Unchecked" legend_exp="" source="./directions_to_start.shp|layername=directions_to_start" name="directions_to_start" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" providerKey="ogr" legend_split_behavior="0" patch_size="0,0" expanded="1">
-        <customproperties>
-          <Option type="Map">
-            <Option value="directions_to_start" type="QString" name="cached_name"/>
-          </Option>
-        </customproperties>
-      </layer-tree-layer>
-    </layer-tree-group>
-    <layer-tree-group checked="Qt::Unchecked" name="Residents Access" groupLayer="" expanded="0">
-      <customproperties>
-        <Option/>
-      </customproperties>
-      <layer-tree-layer checked="Qt::Unchecked" legend_exp="" source="./mayor.shp" name="mayor" id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" providerKey="ogr" legend_split_behavior="0" patch_size="0,0" expanded="1">
-        <customproperties>
-          <Option type="Map">
-            <Option value="mayor" type="QString" name="cached_name"/>
-          </Option>
-        </customproperties>
-      </layer-tree-layer>
-      <layer-tree-layer checked="Qt::Unchecked" legend_exp="" source="./viplabels.shp" name="viplabels" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" providerKey="ogr" legend_split_behavior="0" patch_size="0,0" expanded="1">
-        <customproperties>
-          <Option type="Map">
-            <Option value="viplabels" type="QString" name="cached_name"/>
+            <Option type="QString" value="water_tables" name="cached_name"/>
             <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer checked="Qt::Unchecked" legend_exp="" source="./vipaccess.shp" name="vipaccess" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" providerKey="ogr" legend_split_behavior="0" patch_size="0,0" expanded="1">
+    </layer-tree-group>
+    <layer-tree-group expanded="0" groupLayer="" checked="Qt::Unchecked" name="Ask Me">
+      <customproperties>
+        <Option/>
+      </customproperties>
+      <layer-tree-layer id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" expanded="1" legend_split_behavior="0" source="./poi_labels.shp|layername=poi_labels" legend_exp="" providerKey="ogr" patch_size="0,0" checked="Qt::Unchecked" name="poi_labels">
         <customproperties>
           <Option type="Map">
-            <Option value="vipaccess" type="QString" name="cached_name"/>
+            <Option type="QString" value="poi_labels" name="cached_name"/>
+          </Option>
+        </customproperties>
+      </layer-tree-layer>
+      <layer-tree-layer id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" expanded="1" legend_split_behavior="0" source="./directions_to_start.shp|layername=directions_to_start" legend_exp="" providerKey="ogr" patch_size="0,0" checked="Qt::Unchecked" name="directions_to_start">
+        <customproperties>
+          <Option type="Map">
+            <Option type="QString" value="directions_to_start" name="cached_name"/>
+          </Option>
+        </customproperties>
+      </layer-tree-layer>
+    </layer-tree-group>
+    <layer-tree-group expanded="0" groupLayer="" checked="Qt::Unchecked" name="Residents Access">
+      <customproperties>
+        <Option/>
+      </customproperties>
+      <layer-tree-layer id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" expanded="1" legend_split_behavior="0" source="./mayor.shp" legend_exp="" providerKey="ogr" patch_size="0,0" checked="Qt::Unchecked" name="mayor">
+        <customproperties>
+          <Option type="Map">
+            <Option type="QString" value="mayor" name="cached_name"/>
+          </Option>
+        </customproperties>
+      </layer-tree-layer>
+      <layer-tree-layer id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" expanded="1" legend_split_behavior="0" source="./viplabels.shp" legend_exp="" providerKey="ogr" patch_size="0,0" checked="Qt::Unchecked" name="viplabels">
+        <customproperties>
+          <Option type="Map">
+            <Option type="QString" value="viplabels" name="cached_name"/>
             <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer checked="Qt::Unchecked" legend_exp="" source="./golfaccess.shp" name="golfaccess" id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" providerKey="ogr" legend_split_behavior="0" patch_size="0,0" expanded="0">
+      <layer-tree-layer id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" expanded="1" legend_split_behavior="0" source="./vipaccess.shp" legend_exp="" providerKey="ogr" patch_size="0,0" checked="Qt::Unchecked" name="vipaccess">
+        <customproperties>
+          <Option type="Map">
+            <Option type="QString" value="vipaccess" name="cached_name"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
+          </Option>
+        </customproperties>
+      </layer-tree-layer>
+      <layer-tree-layer id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" expanded="0" legend_split_behavior="0" source="./golfaccess.shp" legend_exp="" providerKey="ogr" patch_size="0,0" checked="Qt::Unchecked" name="golfaccess">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer checked="Qt::Unchecked" legend_exp="" source="./residents_access_roads.shp|layername=residents_access_roads" name="residents_access_roads" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" providerKey="ogr" legend_split_behavior="0" patch_size="0,0" expanded="1">
+      <layer-tree-layer id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" expanded="1" legend_split_behavior="0" source="./residents_access_roads.shp|layername=residents_access_roads" legend_exp="" providerKey="ogr" patch_size="0,0" checked="Qt::Unchecked" name="residents_access_roads">
         <customproperties>
           <Option type="Map">
-            <Option value="residents_access_roads" type="QString" name="cached_name"/>
+            <Option type="QString" value="residents_access_roads" name="cached_name"/>
             <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer checked="Qt::Unchecked" legend_exp="" source="./residents_access.shp|layername=residents_access" name="residents_access" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" providerKey="ogr" legend_split_behavior="0" patch_size="0,0" expanded="1">
+      <layer-tree-layer id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" expanded="1" legend_split_behavior="0" source="./residents_access.shp|layername=residents_access" legend_exp="" providerKey="ogr" patch_size="0,0" checked="Qt::Unchecked" name="residents_access">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group checked="Qt::Checked" name="OSM data" groupLayer="" expanded="1">
+    <layer-tree-group expanded="1" groupLayer="" checked="Qt::Checked" name="OSM data">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer checked="Qt::Checked" legend_exp="" source="./osm_roads.shp" name="osm_roads" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" providerKey="ogr" legend_split_behavior="0" patch_size="0,0" expanded="0">
+      <layer-tree-layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0" legend_split_behavior="0" source="./osm_roads.shp" legend_exp="" providerKey="ogr" patch_size="0,0" checked="Qt::Checked" name="osm_roads">
         <customproperties>
           <Option type="Map">
-            <Option value="osm_roads [3887]" type="QString" name="cached_name"/>
-            <Option name="expandedLegendNodes"/>
-            <Option value="1" type="QString" name="showFeatureCount"/>
+            <Option type="QString" value="osm_roads [3887]" name="cached_name"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
+            <Option type="QString" value="1" name="showFeatureCount"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer checked="Qt::Checked" legend_exp="" source="./osm_places.shp|layername=osm_places" name="osm_places" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" providerKey="ogr" legend_split_behavior="0" patch_size="0,0" expanded="1">
+      <layer-tree-layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" expanded="1" legend_split_behavior="0" source="./osm_places.shp|layername=osm_places" legend_exp="" providerKey="ogr" patch_size="0,0" checked="Qt::Checked" name="osm_places">
         <customproperties>
           <Option type="Map">
-            <Option value="osm_places [7]" type="QString" name="cached_name"/>
-            <Option name="expandedLegendNodes"/>
-            <Option value="1" type="QString" name="showFeatureCount"/>
+            <Option type="QString" value="osm_places [7]" name="cached_name"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
+            <Option type="QString" value="1" name="showFeatureCount"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group checked="Qt::Unchecked" name="Start and Finish pages" groupLayer="" expanded="1">
+    <layer-tree-group expanded="1" groupLayer="" checked="Qt::Unchecked" name="Start and Finish pages">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer checked="Qt::Unchecked" legend_exp="" source="./data-comments.shp" name="data-comments" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" providerKey="ogr" legend_split_behavior="0" patch_size="0,0" expanded="1">
+      <layer-tree-layer id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" expanded="1" legend_split_behavior="0" source="./data-comments.shp" legend_exp="" providerKey="ogr" patch_size="0,0" checked="Qt::Unchecked" name="data-comments">
         <customproperties>
           <Option type="Map">
             <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer checked="Qt::Unchecked" legend_exp="" source="./start_finish_area.shp" name="start_finish_area" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" providerKey="ogr" legend_split_behavior="0" patch_size="0,0" expanded="1">
+      <layer-tree-layer id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" expanded="1" legend_split_behavior="0" source="./start_finish_area.shp" legend_exp="" providerKey="ogr" patch_size="0,0" checked="Qt::Unchecked" name="start_finish_area">
         <customproperties>
           <Option type="Map">
             <Option type="invalid" name="expandedLegendNodes"/>
@@ -237,35 +237,35 @@
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group checked="Qt::Unchecked" name="Elevation" groupLayer="" expanded="0">
+    <layer-tree-group expanded="0" groupLayer="" checked="Qt::Unchecked" name="Elevation">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer checked="Qt::Unchecked" legend_exp="" source="./capetownelevation-1m.shp" name="capetownelevation-1m" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" providerKey="ogr" legend_split_behavior="0" patch_size="0,0" expanded="1">
+      <layer-tree-layer id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" expanded="1" legend_split_behavior="0" source="./capetownelevation-1m.shp" legend_exp="" providerKey="ogr" patch_size="0,0" checked="Qt::Unchecked" name="capetownelevation-1m">
         <customproperties>
           <Option type="Map">
-            <Option value="1" type="QString" name="showFeatureCount"/>
+            <Option type="QString" value="1" name="showFeatureCount"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group checked="Qt::Checked" name="Map" groupLayer="" expanded="1">
+    <layer-tree-group expanded="1" groupLayer="" checked="Qt::Checked" name="Map">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer checked="Qt::Unchecked" legend_exp="" source="./GDAL-City of Cape Town 2015 Aerial.xml" name="GDAL-City of Cape Town 2015 Aerial" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" providerKey="gdal" legend_split_behavior="0" patch_size="0,0" expanded="0">
+      <layer-tree-layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" expanded="0" legend_split_behavior="0" source="./GDAL-City of Cape Town 2015 Aerial.xml" legend_exp="" providerKey="gdal" patch_size="0,0" checked="Qt::Unchecked" name="GDAL-City of Cape Town 2015 Aerial">
         <customproperties>
           <Option type="Map">
-            <Option value="GDAL-City of Cape Town 2015 Aerial" type="QString" name="cached_name"/>
+            <Option type="QString" value="GDAL-City of Cape Town 2015 Aerial" name="cached_name"/>
             <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer checked="Qt::Checked" legend_exp="" 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" name="Outlines" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" providerKey="wms" legend_split_behavior="0" patch_size="0,0" expanded="1">
+      <layer-tree-layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" expanded="1" legend_split_behavior="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" legend_exp="" providerKey="wms" patch_size="0,0" checked="Qt::Checked" name="Outlines">
         <customproperties>
           <Option type="Map">
-            <Option value="Outlines" type="QString" name="cached_name"/>
-            <Option name="expandedLegendNodes"/>
+            <Option type="QString" value="Outlines" name="cached_name"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
@@ -295,34 +295,34 @@
       <item>viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0</item>
       <item>fence_groups_cbaea960_3348_4aea_b155_46e5d310f792</item>
       <item>mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea</item>
-      <item>route_markers_d58f7174_b6d0_4e1c_80ed_0d74635b8ca6</item>
+      <item>route_markers_4e92bf25_f500_4b5f_bf49_9dd0b475a0c9</item>
     </custom-order>
   </layer-tree-group>
-  <snapping-settings unit="1" intersection-snapping="1" scaleDependencyMode="0" minScale="0" mode="3" maxScale="0" type="1" tolerance="10" self-snapping="1" enabled="0">
+  <snapping-settings self-snapping="1" minScale="0" unit="1" intersection-snapping="1" tolerance="10" scaleDependencyMode="0" type="1" maxScale="0" enabled="0" mode="3">
     <individual-layer-settings>
-      <layer-setting minScale="0" maxScale="0" type="1" id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" tolerance="12" enabled="0" units="1"/>
-      <layer-setting minScale="0" maxScale="0" type="2" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" tolerance="12" enabled="0" units="1"/>
-      <layer-setting minScale="0" maxScale="0" type="2" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" tolerance="12" enabled="0" units="1"/>
-      <layer-setting minScale="0" maxScale="0" type="2" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" tolerance="12" enabled="0" units="1"/>
-      <layer-setting minScale="0" maxScale="0" type="2" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" tolerance="12" enabled="0" units="1"/>
-      <layer-setting minScale="0" maxScale="0" type="2" id="water_tables20170921142016467" tolerance="0" enabled="0" units="2"/>
-      <layer-setting minScale="0" maxScale="0" type="2" id="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792" tolerance="12" enabled="0" units="1"/>
-      <layer-setting minScale="0" maxScale="0" type="2" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" tolerance="12" enabled="0" units="1"/>
-      <layer-setting minScale="0" maxScale="0" type="2" id="extra_security20170921130834191" tolerance="0" enabled="0" units="2"/>
-      <layer-setting minScale="0" maxScale="0" type="2" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" tolerance="12" enabled="0" units="1"/>
-      <layer-setting minScale="0" maxScale="0" type="2" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" tolerance="12" enabled="0" units="1"/>
-      <layer-setting minScale="0" maxScale="0" type="2" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" tolerance="12" enabled="0" units="1"/>
-      <layer-setting minScale="0" maxScale="0" type="1" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" tolerance="12" enabled="0" units="1"/>
-      <layer-setting minScale="0" maxScale="0" type="0" id="route_markers_d58f7174_b6d0_4e1c_80ed_0d74635b8ca6" tolerance="12" enabled="0" units="1"/>
-      <layer-setting minScale="0" maxScale="0" type="1" id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" tolerance="12" enabled="0" units="1"/>
-      <layer-setting minScale="0" maxScale="0" type="1" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" tolerance="12" enabled="0" units="1"/>
-      <layer-setting minScale="0" maxScale="0" type="2" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" tolerance="12" enabled="0" units="1"/>
-      <layer-setting minScale="0" maxScale="0" type="2" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" tolerance="12" enabled="0" units="1"/>
-      <layer-setting minScale="0" maxScale="0" type="2" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" tolerance="12" enabled="0" units="1"/>
-      <layer-setting minScale="0" maxScale="0" type="2" id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" tolerance="12" enabled="0" units="1"/>
-      <layer-setting minScale="0" maxScale="0" type="2" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" tolerance="12" enabled="0" units="1"/>
-      <layer-setting minScale="0" maxScale="0" type="2" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" tolerance="12" enabled="0" units="1"/>
-      <layer-setting minScale="0" maxScale="0" type="2" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" tolerance="20" enabled="1" units="1"/>
+      <layer-setting id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" minScale="0" tolerance="12" type="1" maxScale="0" units="1" enabled="0"/>
+      <layer-setting id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" minScale="0" tolerance="12" type="2" maxScale="0" units="1" enabled="0"/>
+      <layer-setting id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" minScale="0" tolerance="12" type="1" maxScale="0" units="1" enabled="0"/>
+      <layer-setting id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" minScale="0" tolerance="12" type="1" maxScale="0" units="1" enabled="0"/>
+      <layer-setting id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" minScale="0" tolerance="12" type="2" maxScale="0" units="1" enabled="0"/>
+      <layer-setting id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" minScale="0" tolerance="12" type="1" maxScale="0" units="1" enabled="0"/>
+      <layer-setting id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" minScale="0" tolerance="12" type="2" maxScale="0" units="1" enabled="0"/>
+      <layer-setting id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" minScale="0" tolerance="20" type="2" maxScale="0" units="1" enabled="1"/>
+      <layer-setting id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" minScale="0" tolerance="12" type="2" maxScale="0" units="1" enabled="0"/>
+      <layer-setting id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" minScale="0" tolerance="12" type="2" maxScale="0" units="1" enabled="0"/>
+      <layer-setting id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" minScale="0" tolerance="12" type="2" maxScale="0" units="1" enabled="0"/>
+      <layer-setting id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" minScale="0" tolerance="12" type="2" maxScale="0" units="1" enabled="0"/>
+      <layer-setting id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" minScale="0" tolerance="12" type="2" maxScale="0" units="1" enabled="0"/>
+      <layer-setting id="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792" minScale="0" tolerance="12" type="2" maxScale="0" units="1" enabled="0"/>
+      <layer-setting id="water_tables20170921142016467" minScale="0" tolerance="0" type="2" maxScale="0" units="2" enabled="0"/>
+      <layer-setting id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" minScale="0" tolerance="12" type="2" maxScale="0" units="1" enabled="0"/>
+      <layer-setting id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" minScale="0" tolerance="12" type="2" maxScale="0" units="1" enabled="0"/>
+      <layer-setting id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" minScale="0" tolerance="12" type="2" maxScale="0" units="1" enabled="0"/>
+      <layer-setting id="extra_security20170921130834191" minScale="0" tolerance="0" type="2" maxScale="0" units="2" enabled="0"/>
+      <layer-setting id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" minScale="0" tolerance="12" type="2" maxScale="0" units="1" enabled="0"/>
+      <layer-setting id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" minScale="0" tolerance="12" type="2" maxScale="0" units="1" enabled="0"/>
+      <layer-setting id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" minScale="0" tolerance="12" type="2" maxScale="0" units="1" enabled="0"/>
+      <layer-setting id="route_markers_4e92bf25_f500_4b5f_bf49_9dd0b475a0c9" minScale="0" tolerance="12" type="0" maxScale="0" units="1" enabled="0"/>
     </individual-layer-settings>
   </snapping-settings>
   <relations/>
@@ -330,10 +330,10 @@
   <mapcanvas annotationsVisible="1" name="theMapCanvas">
     <units>degrees</units>
     <extent>
-      <xmin>18.40304680199827914</xmin>
-      <ymin>-33.91746432349552265</ymin>
-      <xmax>18.41687072757535049</xmax>
-      <ymax>-33.90119829484044089</ymax>
+      <xmin>18.38106081301657824</xmin>
+      <ymin>-33.94563030202068887</ymin>
+      <xmax>18.41792461455543517</xmax>
+      <ymax>-33.90225422560713753</ymax>
     </extent>
     <rotation>0</rotation>
     <destinationsrs>
@@ -354,161 +354,161 @@
   </mapcanvas>
   <projectModels/>
   <legend updateDrawingOrder="true">
-    <legendgroup checked="Qt::Unchecked" name="Marshals" open="true">
-      <legendlayer checked="Qt::Unchecked" showFeatureCount="1" name="marshal_positions" drawingOrder="-1" open="true">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="0"/>
+    <legendgroup open="true" checked="Qt::Unchecked" name="Marshals">
+      <legendlayer open="true" showFeatureCount="1" checked="Qt::Unchecked" drawingOrder="-1" name="marshal_positions">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile layerid="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" showFeatureCount="0" name="extra_security" drawingOrder="-1" open="true">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="extra_security20170921130834191" visible="0"/>
+      <legendlayer open="true" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" name="extra_security">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile layerid="extra_security20170921130834191" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" showFeatureCount="0" name="marshals_by_position" drawingOrder="-1" open="true">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="marshals_by_position20161003112326575" visible="0"/>
+      <legendlayer open="true" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" name="marshals_by_position">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile layerid="marshals_by_position20161003112326575" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" showFeatureCount="0" name="complete_marshal_overview" drawingOrder="-1" open="true">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" visible="0"/>
+      <legendlayer open="true" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" name="complete_marshal_overview">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile layerid="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" showFeatureCount="0" name="marshal_overviews" drawingOrder="-1" open="false">
-        <filegroup hidden="false" open="false">
-          <legendlayerfile isInOverview="0" layerid="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" visible="0"/>
+      <legendlayer open="false" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" name="marshal_overviews">
+        <filegroup open="false" hidden="false">
+          <legendlayerfile layerid="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Unchecked" name="Fencing and Cones" open="true">
-      <legendlayer checked="Qt::Unchecked" showFeatureCount="0" name="fencing" drawingOrder="-1" open="true">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0"/>
+    <legendgroup open="true" checked="Qt::Unchecked" name="Fencing and Cones">
+      <legendlayer open="true" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" name="fencing">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile layerid="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" showFeatureCount="0" name="fence_groups" drawingOrder="-1" open="true">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792" visible="0"/>
+      <legendlayer open="true" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" name="fence_groups">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile layerid="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Checked" name="Routes" open="true">
-      <legendgroup checked="Qt::Checked" name="Markers" open="true">
-        <legendlayer checked="Qt::Unchecked" showFeatureCount="1" name="route_markers" drawingOrder="-1" open="true">
-          <filegroup hidden="false" open="true">
-            <legendlayerfile isInOverview="0" layerid="route_markers_d58f7174_b6d0_4e1c_80ed_0d74635b8ca6" visible="0"/>
+    <legendgroup open="true" checked="Qt::Checked" name="Routes">
+      <legendgroup open="true" checked="Qt::Checked" name="Markers">
+        <legendlayer open="true" showFeatureCount="1" checked="Qt::Checked" drawingOrder="-1" name="route_markers">
+          <filegroup open="true" hidden="false">
+            <legendlayerfile layerid="route_markers_4e92bf25_f500_4b5f_bf49_9dd0b475a0c9" isInOverview="0" visible="1"/>
           </filegroup>
         </legendlayer>
       </legendgroup>
-      <legendlayer checked="Qt::Checked" showFeatureCount="0" name="all_routes" drawingOrder="-1" open="true">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1"/>
+      <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" drawingOrder="-1" name="all_routes">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile layerid="all_routes_5833accf_77da_42ef_a24a_197208cd2190" isInOverview="0" visible="1"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendlayer checked="Qt::Unchecked" showFeatureCount="0" name="timelapse" drawingOrder="-1" open="false">
-      <filegroup hidden="false" open="false">
-        <legendlayerfile isInOverview="0" layerid="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" visible="0"/>
+    <legendlayer open="false" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" name="timelapse">
+      <filegroup open="false" hidden="false">
+        <legendlayerfile layerid="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" isInOverview="0" visible="0"/>
       </filegroup>
     </legendlayer>
-    <legendgroup checked="Qt::Checked" name="Feeding Stations" open="true">
-      <legendlayer checked="Qt::Unchecked" showFeatureCount="0" name="water_tables" drawingOrder="-1" open="true">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="water_tables20170921142016467" visible="0"/>
+    <legendgroup open="true" checked="Qt::Checked" name="Feeding Stations">
+      <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" drawingOrder="-1" name="water_tables">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile layerid="water_tables20170921142016467" isInOverview="0" visible="1"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Unchecked" name="Ask Me" open="false">
-      <legendlayer checked="Qt::Unchecked" showFeatureCount="0" name="poi_labels" drawingOrder="-1" open="true">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" visible="0"/>
+    <legendgroup open="false" checked="Qt::Unchecked" name="Ask Me">
+      <legendlayer open="true" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" name="poi_labels">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile layerid="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" showFeatureCount="0" name="directions_to_start" drawingOrder="-1" open="true">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" visible="0"/>
+      <legendlayer open="true" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" name="directions_to_start">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile layerid="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Unchecked" name="Residents Access" open="false">
-      <legendlayer checked="Qt::Unchecked" showFeatureCount="0" name="mayor" drawingOrder="-1" open="true">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" visible="0"/>
+    <legendgroup open="false" checked="Qt::Unchecked" name="Residents Access">
+      <legendlayer open="true" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" name="mayor">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile layerid="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" showFeatureCount="0" name="viplabels" drawingOrder="-1" open="true">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" visible="0"/>
+      <legendlayer open="true" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" name="viplabels">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile layerid="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" showFeatureCount="0" name="vipaccess" drawingOrder="-1" open="true">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" visible="0"/>
+      <legendlayer open="true" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" name="vipaccess">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile layerid="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" showFeatureCount="0" name="golfaccess" drawingOrder="-1" open="false">
-        <filegroup hidden="false" open="false">
-          <legendlayerfile isInOverview="0" layerid="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" visible="0"/>
+      <legendlayer open="false" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" name="golfaccess">
+        <filegroup open="false" hidden="false">
+          <legendlayerfile layerid="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" showFeatureCount="0" name="residents_access_roads" drawingOrder="-1" open="true">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" visible="0"/>
+      <legendlayer open="true" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" name="residents_access_roads">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile layerid="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" showFeatureCount="0" name="residents_access" drawingOrder="-1" open="true">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" visible="0"/>
+      <legendlayer open="true" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" name="residents_access">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile layerid="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Checked" name="OSM data" open="true">
-      <legendlayer checked="Qt::Checked" showFeatureCount="1" name="osm_roads" drawingOrder="-1" open="false">
-        <filegroup hidden="false" open="false">
-          <legendlayerfile isInOverview="0" layerid="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1"/>
+    <legendgroup open="true" checked="Qt::Checked" name="OSM data">
+      <legendlayer open="false" showFeatureCount="1" checked="Qt::Checked" drawingOrder="-1" name="osm_roads">
+        <filegroup open="false" hidden="false">
+          <legendlayerfile layerid="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" isInOverview="0" visible="1"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Checked" showFeatureCount="1" name="osm_places" drawingOrder="-1" open="true">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1"/>
+      <legendlayer open="true" showFeatureCount="1" checked="Qt::Checked" drawingOrder="-1" name="osm_places">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile layerid="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" isInOverview="0" visible="1"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Unchecked" name="Start and Finish pages" open="true">
-      <legendlayer checked="Qt::Unchecked" showFeatureCount="0" name="data-comments" drawingOrder="-1" open="true">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" visible="0"/>
+    <legendgroup open="true" checked="Qt::Unchecked" name="Start and Finish pages">
+      <legendlayer open="true" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" name="data-comments">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile layerid="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" showFeatureCount="0" name="start_finish_area" drawingOrder="-1" open="true">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" visible="0"/>
+      <legendlayer open="true" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" name="start_finish_area">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile layerid="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Unchecked" name="Elevation" open="false">
-      <legendlayer checked="Qt::Unchecked" showFeatureCount="1" name="capetownelevation-1m" drawingOrder="-1" open="true">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" visible="0"/>
+    <legendgroup open="false" checked="Qt::Unchecked" name="Elevation">
+      <legendlayer open="true" showFeatureCount="1" checked="Qt::Unchecked" drawingOrder="-1" name="capetownelevation-1m">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile layerid="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Checked" name="Map" open="true">
-      <legendlayer checked="Qt::Unchecked" showFeatureCount="0" name="GDAL-City of Cape Town 2015 Aerial" drawingOrder="-1" open="false">
-        <filegroup hidden="false" open="false">
-          <legendlayerfile isInOverview="0" layerid="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="0"/>
+    <legendgroup open="true" checked="Qt::Checked" name="Map">
+      <legendlayer open="false" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" name="GDAL-City of Cape Town 2015 Aerial">
+        <filegroup open="false" hidden="false">
+          <legendlayerfile layerid="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Checked" showFeatureCount="0" name="Outlines" drawingOrder="-1" open="true">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1"/>
+      <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" drawingOrder="-1" name="Outlines">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile layerid="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" isInOverview="0" visible="1"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
   </legend>
   <mapViewDocks/>
-  <main-annotation-layer refreshOnNotifyEnabled="0" autoRefreshTime="0" type="annotation" autoRefreshEnabled="0" legendPlaceholderImage="" refreshOnNotifyMessage="">
+  <main-annotation-layer refreshOnNotifyEnabled="0" refreshOnNotifyMessage="" type="annotation" legendPlaceholderImage="" autoRefreshTime="0" autoRefreshEnabled="0">
     <id>Annotations_246fb3fe_ae9e_4941_a02a_224c6f83119c</id>
     <datasource></datasource>
     <keywordList>
@@ -559,7 +559,7 @@
     <paintEffect/>
   </main-annotation-layer>
   <projectlayers>
-    <maplayer minScale="1e+08" refreshOnNotifyEnabled="0" autoRefreshTime="0" maxScale="100000" type="raster" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" autoRefreshEnabled="0" legendPlaceholderImage="" refreshOnNotifyMessage="">
+    <maplayer refreshOnNotifyEnabled="0" refreshOnNotifyMessage="" minScale="1e+08" hasScaleBasedVisibilityFlag="0" type="raster" maxScale="100000" legendPlaceholderImage="" styleCategories="AllStyleCategories" autoRefreshTime="0" autoRefreshEnabled="0">
       <extent>
         <xmin>-20037508.33999999985098839</xmin>
         <ymin>-20037508.33999999985098839</ymin>
@@ -624,7 +624,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxy="0" minz="0" dimensions="2" maxx="0" maxz="0" miny="0" minx="0" crs=""/>
+          <spatial maxz="0" minx="0" maxx="0" minz="0" crs="" miny="0" maxy="0" dimensions="2"/>
           <temporal>
             <period>
               <start></start>
@@ -649,58 +649,58 @@
         <Searchable>0</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fetchMode="0" mode="0" enabled="0">
+      <temporal fetchMode="0" enabled="0" mode="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zscale="1" band="1" symbology="Line" zoffset="0" enabled="0">
+      <elevation symbology="Line" zscale="1" band="1" zoffset="0" enabled="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="152,125,183,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="152,125,183,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -731,36 +731,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="152,125,183,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="152,125,183,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                <Option type="QString" value="no" name="outline_style"/>
+                <Option type="QString" value="0.26" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="152,125,183,255"/>
@@ -775,9 +775,9 @@
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -786,27 +786,27 @@
       </elevation>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="no_action" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option value="false" type="QString" name="WMSBackgroundLayer"/>
-          <Option value="false" type="QString" name="WMSPublishDataSourceUrl"/>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
-          <Option value="Value" type="QString" name="identify/format"/>
+          <Option type="QString" value="copy" name="QFieldSync/action"/>
+          <Option type="QString" value="no_action" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="false" name="WMSBackgroundLayer"/>
+          <Option type="QString" value="false" name="WMSPublishDataSourceUrl"/>
+          <Option type="QString" value="0" name="embeddedWidgets/count"/>
+          <Option type="QString" value="Value" name="identify/format"/>
         </Option>
       </customproperties>
       <pipe-data-defined-properties>
         <Option type="Map">
-          <Option value="" type="QString" name="name"/>
+          <Option type="QString" value="" name="name"/>
           <Option name="properties"/>
-          <Option value="collection" type="QString" name="type"/>
+          <Option type="QString" value="collection" name="type"/>
         </Option>
       </pipe-data-defined-properties>
       <pipe>
         <provider>
-          <resampling maxOversampling="2" zoomedInResamplingMethod="nearestNeighbour" zoomedOutResamplingMethod="nearestNeighbour" enabled="false"/>
+          <resampling zoomedOutResamplingMethod="nearestNeighbour" enabled="false" maxOversampling="2" zoomedInResamplingMethod="nearestNeighbour"/>
         </provider>
-        <rasterrenderer opacity="0.5" alphaBand="-1" nodataColor="" type="multibandcolor" redBand="1" greenBand="2" blueBand="3">
+        <rasterrenderer redBand="1" type="multibandcolor" opacity="0.5" alphaBand="-1" nodataColor="" greenBand="2" blueBand="3">
           <rasterTransparency/>
           <minMaxOrigin>
             <limits>None</limits>
@@ -817,14 +817,14 @@
             <stdDevFactor>2</stdDevFactor>
           </minMaxOrigin>
         </rasterrenderer>
-        <brightnesscontrast gamma="1" contrast="0" brightness="0"/>
-        <huesaturation colorizeOn="0" grayscaleMode="0" colorizeStrength="100" colorizeBlue="128" saturation="0" colorizeRed="255" colorizeGreen="128" invertColors="0"/>
+        <brightnesscontrast gamma="1" brightness="0" contrast="0"/>
+        <huesaturation saturation="0" grayscaleMode="0" colorizeBlue="128" colorizeOn="0" invertColors="0" colorizeGreen="128" colorizeStrength="100" colorizeRed="255"/>
         <rasterresampler maxOversampling="2"/>
         <resamplingStage>resamplingFilter</resamplingStage>
       </pipe>
       <blendMode>0</blendMode>
     </maplayer>
-    <maplayer minScale="1e+08" refreshOnNotifyEnabled="0" autoRefreshTime="0" maxScale="0" type="raster" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" autoRefreshEnabled="0" legendPlaceholderImage="" refreshOnNotifyMessage="">
+    <maplayer refreshOnNotifyEnabled="0" refreshOnNotifyMessage="" minScale="1e+08" hasScaleBasedVisibilityFlag="0" type="raster" maxScale="0" legendPlaceholderImage="" styleCategories="AllStyleCategories" autoRefreshTime="0" autoRefreshEnabled="0">
       <extent>
         <xmin>-20037508.34278924390673637</xmin>
         <ymin>-20037508.62692909315228462</ymin>
@@ -889,7 +889,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxy="0" minz="0" dimensions="2" maxx="0" maxz="0" miny="0" minx="0" crs=""/>
+          <spatial maxz="0" minx="0" maxx="0" minz="0" crs="" miny="0" maxy="0" dimensions="2"/>
           <temporal>
             <period>
               <start></start>
@@ -912,58 +912,58 @@
         <Searchable>0</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fetchMode="0" mode="0" enabled="0">
+      <temporal fetchMode="0" enabled="0" mode="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zscale="1" band="1" symbology="Line" zoffset="0" enabled="0">
+      <elevation symbology="Line" zscale="1" band="1" zoffset="0" enabled="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="225,89,137,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="225,89,137,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -994,36 +994,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="225,89,137,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="225,89,137,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                <Option type="QString" value="no" name="outline_style"/>
+                <Option type="QString" value="0.26" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="225,89,137,255"/>
@@ -1038,9 +1038,9 @@
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -1049,27 +1049,27 @@
       </elevation>
       <customproperties>
         <Option type="Map">
-          <Option value="no_action" type="QString" name="QFieldSync/action"/>
-          <Option value="no_action" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option value="true" type="QString" name="WMSBackgroundLayer"/>
-          <Option value="false" type="QString" name="WMSPublishDataSourceUrl"/>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
-          <Option value="Undefined" type="QString" name="identify/format"/>
+          <Option type="QString" value="no_action" name="QFieldSync/action"/>
+          <Option type="QString" value="no_action" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="true" name="WMSBackgroundLayer"/>
+          <Option type="QString" value="false" name="WMSPublishDataSourceUrl"/>
+          <Option type="QString" value="0" name="embeddedWidgets/count"/>
+          <Option type="QString" value="Undefined" name="identify/format"/>
         </Option>
       </customproperties>
       <pipe-data-defined-properties>
         <Option type="Map">
-          <Option value="" type="QString" name="name"/>
+          <Option type="QString" value="" name="name"/>
           <Option name="properties"/>
-          <Option value="collection" type="QString" name="type"/>
+          <Option type="QString" value="collection" name="type"/>
         </Option>
       </pipe-data-defined-properties>
       <pipe>
         <provider>
-          <resampling maxOversampling="2" zoomedInResamplingMethod="nearestNeighbour" zoomedOutResamplingMethod="nearestNeighbour" enabled="false"/>
+          <resampling zoomedOutResamplingMethod="nearestNeighbour" enabled="false" maxOversampling="2" zoomedInResamplingMethod="nearestNeighbour"/>
         </provider>
-        <rasterrenderer opacity="0.75" alphaBand="-1" band="1" nodataColor="" type="singlebandcolordata">
+        <rasterrenderer type="singlebandcolordata" opacity="0.75" alphaBand="-1" band="1" nodataColor="">
           <rasterTransparency/>
           <minMaxOrigin>
             <limits>None</limits>
@@ -1080,25 +1080,25 @@
             <stdDevFactor>2</stdDevFactor>
           </minMaxOrigin>
         </rasterrenderer>
-        <brightnesscontrast gamma="1" contrast="0" brightness="0"/>
-        <huesaturation colorizeOn="0" grayscaleMode="0" colorizeStrength="100" colorizeBlue="128" saturation="0" colorizeRed="255" colorizeGreen="128" invertColors="0"/>
+        <brightnesscontrast gamma="1" brightness="0" contrast="0"/>
+        <huesaturation saturation="0" grayscaleMode="0" colorizeBlue="128" colorizeOn="0" invertColors="0" colorizeGreen="128" colorizeStrength="100" colorizeRed="255"/>
         <rasterresampler maxOversampling="2"/>
         <resamplingStage>resamplingFilter</resamplingStage>
       </pipe>
       <blendMode>0</blendMode>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" simplifyLocal="1" autoRefreshTime="0" wkbType="MultiLineString" simplifyDrawingHints="0" type="vector" symbologyReferenceScale="-1" minScale="100000000" legendPlaceholderImage="" refreshOnNotifyEnabled="0" labelsEnabled="1" maxScale="100000" styleCategories="AllStyleCategories" simplifyAlgorithm="0" refreshOnNotifyMessage="" readOnly="0" geometry="Line" autoRefreshEnabled="0" simplifyDrawingTol="1">
+    <maplayer simplifyLocal="1" simplifyDrawingHints="0" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1" legendPlaceholderImage="" symbologyReferenceScale="-1" readOnly="0" refreshOnNotifyEnabled="0" minScale="100000000" maxScale="100000" type="vector" autoRefreshTime="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="1" styleCategories="AllStyleCategories" geometry="Line" autoRefreshEnabled="0" wkbType="MultiLineString">
       <extent>
         <xmin>18.37527226735897301</xmin>
         <ymin>-33.95648400000000322</ymin>
         <xmax>18.42291227690369482</xmax>
-        <ymax>-33.89943829535213382</ymax>
+        <ymax>-33.89943073673109808</ymax>
       </extent>
       <wgs84extent>
         <xmin>18.37527226735897301</xmin>
         <ymin>-33.95648400000000322</ymin>
         <xmax>18.42291227690369482</xmax>
-        <ymax>-33.89943829535213382</ymax>
+        <ymax>-33.89943073673109808</ymax>
       </wgs84extent>
       <id>all_routes_5833accf_77da_42ef_a24a_197208cd2190</id>
       <datasource>./all_routes.shp|layername=all_routes</datasource>
@@ -1152,7 +1152,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxy="0" minz="0" dimensions="2" maxx="0" maxz="0" miny="0" minx="0" crs=""/>
+          <spatial maxz="0" minx="0" maxx="0" minz="0" crs="" miny="0" maxy="0" dimensions="2"/>
           <temporal>
             <period>
               <start></start>
@@ -1166,8 +1166,8 @@
       <layerDependencies/>
       <dataDependencies/>
       <expressionfields>
-        <field typeName="double precision" subType="0" type="6" name="length_km" precision="0" expression="$length * 100" length="-1" comment=""/>
-        <field typeName="double precision" subType="0" type="6" name="length_m" precision="0" expression="$length * 100 * 1000" length="-1" comment=""/>
+        <field precision="0" comment="" type="6" expression="$length * 100" length="-1" subType="0" typeName="double precision" name="length_km"/>
+        <field precision="0" comment="" type="6" expression="$length * 100 * 1000" length="-1" subType="0" typeName="double precision" name="length_m"/>
       </expressionfields>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
@@ -1180,58 +1180,58 @@
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="RouteLen" startExpression="" mode="0" limitMode="0" endField="" fixedDuration="0" accumulate="0" durationUnit="min" startField="" endExpression="" enabled="0">
+      <temporal durationField="RouteLen" fixedDuration="0" accumulate="0" endField="" startField="" enabled="0" startExpression="" endExpression="" durationUnit="min" mode="0" limitMode="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" zscale="1" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" binding="Centroid" type="IndividualFeatures" symbology="Line" extrusion="0" zoffset="0">
+      <elevation extrusionEnabled="0" symbology="Line" type="IndividualFeatures" zscale="1" clamping="Terrain" showMarkerSymbolInSurfacePlots="0" zoffset="0" extrusion="0" respectLayerSymbol="1" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="229,182,54,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="229,182,54,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -1262,36 +1262,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="229,182,54,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="164,130,39,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="229,182,54,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="164,130,39,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="229,182,54,255"/>
@@ -1306,44 +1306,44 @@
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="229,182,54,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="164,130,39,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="229,182,54,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="diamond" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="164,130,39,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="3" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -1366,59 +1366,59 @@
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" type="RuleRenderer" symbollevels="0" referencescale="-1" enableorderby="0">
+      <renderer-v2 enableorderby="0" type="RuleRenderer" symbollevels="0" referencescale="-1" forceraster="0">
         <rules key="{cdec7d40-64aa-438c-9c37-b3d2a98670e7}">
-          <rule filter="$id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone)' )" description="Only show when active in Atlas" symbol="0" label="Active Routes" checkstate="0" key="{7132fb4b-2762-4af3-8eb0-4be2b1c0cf6c}">
-            <rule filter="&quot;Source&quot; = '21KM'" description="This should be disabled, since it's only for legends" symbol="1" label="21KM" checkstate="0" key="{a2b868a3-1709-41cf-b920-118bdfa2d5d3}"/>
-            <rule filter="&quot;Source&quot; = '10KM'" description="This should be disabled, since it's only for legends" symbol="2" label="10KM" checkstate="0" key="{17faeda5-eb56-4a1b-b784-639b6c7334d2}"/>
-            <rule filter="&quot;Source&quot; = '5KM'" description="This should be disabled, since it's only for legends" symbol="3" label="5KM" checkstate="0" key="{bdafe9b2-4918-427d-89be-41870f96981f}"/>
-            <rule filter="&quot;Source&quot; = 'Trail'" description="This should be disabled, since it's only for legends" symbol="4" label="Trail" checkstate="0" key="{151f553a-04cc-4e24-b74d-37d5618f5223}"/>
+          <rule description="Only show when active in Atlas" symbol="0" label="Active Routes" key="{7132fb4b-2762-4af3-8eb0-4be2b1c0cf6c}" filter="$id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone)' )" checkstate="0">
+            <rule description="This should be disabled, since it's only for legends" symbol="1" label="21KM" key="{a2b868a3-1709-41cf-b920-118bdfa2d5d3}" filter="&quot;Source&quot; = '21KM'" checkstate="0"/>
+            <rule description="This should be disabled, since it's only for legends" symbol="2" label="10KM" key="{17faeda5-eb56-4a1b-b784-639b6c7334d2}" filter="&quot;Source&quot; = '10KM'" checkstate="0"/>
+            <rule description="This should be disabled, since it's only for legends" symbol="3" label="5KM" key="{bdafe9b2-4918-427d-89be-41870f96981f}" filter="&quot;Source&quot; = '5KM'" checkstate="0"/>
+            <rule description="This should be disabled, since it's only for legends" symbol="4" label="Trail" key="{151f553a-04cc-4e24-b74d-37d5618f5223}" filter="&quot;Source&quot; = 'Trail'" checkstate="0"/>
           </rule>
-          <rule filter="regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; ) AND ( $id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone)' ) )" description="Only show when active in Atlas" symbol="5" label="Show by day" key="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}">
-            <rule filter="&quot;Source&quot; = '21KM'" description="This should be disabled, since it's only for legends" symbol="6" label="21KM" checkstate="0" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}"/>
-            <rule filter="&quot;Source&quot; = '10KM'" description="This should be disabled, since it's only for legends" symbol="7" label="10KM" checkstate="0" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}"/>
-            <rule filter="&quot;Source&quot; = '5KM'" description="This should be disabled, since it's only for legends" symbol="8" label="5KM" checkstate="0" key="{871a9276-8278-4528-911c-7e434c0885d3}"/>
-            <rule filter="&quot;Source&quot; = 'Trail'" description="This should be disabled, since it's only for legends" symbol="9" label="Trail" checkstate="0" key="{82ba5c12-5eaf-4bf1-af1a-89035ce48b3a}"/>
+          <rule description="Only show when active in Atlas" symbol="5" label="Show by day" key="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}" filter="regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; ) AND ( $id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone)' ) )">
+            <rule description="This should be disabled, since it's only for legends" symbol="6" label="21KM" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" filter="&quot;Source&quot; = '21KM'" checkstate="0"/>
+            <rule description="This should be disabled, since it's only for legends" symbol="7" label="10KM" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" filter="&quot;Source&quot; = '10KM'" checkstate="0"/>
+            <rule description="This should be disabled, since it's only for legends" symbol="8" label="5KM" key="{871a9276-8278-4528-911c-7e434c0885d3}" filter="&quot;Source&quot; = '5KM'" checkstate="0"/>
+            <rule description="This should be disabled, since it's only for legends" symbol="9" label="Trail" key="{82ba5c12-5eaf-4bf1-af1a-89035ce48b3a}" filter="&quot;Source&quot; = 'Trail'" checkstate="0"/>
           </rule>
-          <rule symbol="10" label="Always show" checkstate="0" key="{95b90b1e-90e8-4f30-830e-b2025d38b822}"/>
-          <rule filter="regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" symbol="11" label="Always show by day" checkstate="0" key="{ca3590cd-5839-41e2-824b-eca47a2b7a14}"/>
+          <rule symbol="10" label="Always show" key="{95b90b1e-90e8-4f30-830e-b2025d38b822}" checkstate="0"/>
+          <rule symbol="11" label="Always show by day" key="{ca3590cd-5839-41e2-824b-eca47a2b7a14}" filter="regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" checkstate="0"/>
         </rules>
         <symbols>
-          <symbol is_animated="0" type="line" name="0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="500" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="RenderMetersInMapUnits" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="250" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="RenderMetersInMapUnits" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="Interval" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="500" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="RenderMetersInMapUnits" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="250" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="RenderMetersInMapUnits" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="Interval" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -1438,44 +1438,44 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="interval">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="offsetAlongLine">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" type="marker" name="@0@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+              <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@0@0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer locked="0" class="FilledMarker" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="0,0,0,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MapUnit" type="QString" name="offset_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="0,0,0,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="filled_arrowhead" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MapUnit" name="offset_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="0,0,0,255"/>
@@ -1491,32 +1491,32 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol is_animated="0" type="fill" name="@@0@0@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+                  <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@@0@0@0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="0,0,0,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="227,26,28,0" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="0,0,0,255" name="color"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="227,26,28,0" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="0,0,0,255"/>
@@ -1531,15 +1531,15 @@
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option value="true" type="bool" name="active"/>
-                              <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                              <Option value="3" type="int" name="type"/>
+                              <Option type="bool" value="true" name="active"/>
+                              <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
+                              <Option type="int" value="3" name="type"/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -1547,35 +1547,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.5" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0,0,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.5" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -1606,36 +1606,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="LastVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="3" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="LastVertex" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -1655,40 +1655,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" type="marker" name="@0@2" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+              <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@0@2">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="0,0,0,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="square" name="cap_style"/>
+                    <Option type="QString" value="0,0,0,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="circle" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="0,0,0,0" name="outline_color"/>
+                    <Option type="QString" value="solid" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -1711,38 +1711,38 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option value="true" type="bool" name="active"/>
-                          <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                          <Option value="3" type="int" name="type"/>
+                          <Option type="bool" value="true" name="active"/>
+                          <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
+                          <Option type="int" value="3" name="type"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="FirstVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="3" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="FirstVertex" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -1762,40 +1762,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" type="marker" name="@0@3" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+              <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@0@3">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="0,0,0,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="square" name="cap_style"/>
+                    <Option type="QString" value="0,0,0,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="circle" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="0,0,0,0" name="outline_color"/>
+                    <Option type="QString" value="solid" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -1818,47 +1818,47 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option value="true" type="bool" name="active"/>
-                          <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                          <Option value="3" type="int" name="type"/>
+                          <Option type="bool" value="true" name="active"/>
+                          <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
+                          <Option type="int" value="3" name="type"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol is_animated="0" type="line" name="1" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="500" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="RenderMetersInMapUnits" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="250" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="RenderMetersInMapUnits" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="Interval" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="500" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="RenderMetersInMapUnits" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="250" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="RenderMetersInMapUnits" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="Interval" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -1878,44 +1878,44 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="interval">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="offsetAlongLine">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" type="marker" name="@1@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+              <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@1@0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer locked="0" class="FilledMarker" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="210,32,39,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MapUnit" type="QString" name="offset_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="210,32,39,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="filled_arrowhead" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MapUnit" name="offset_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="210,32,39,255"/>
@@ -1931,32 +1931,32 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol is_animated="0" type="fill" name="@@1@0@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+                  <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@@1@0@0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="210,32,39,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="227,26,28,0" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="210,32,39,255" name="color"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="227,26,28,0" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="210,32,39,255"/>
@@ -1971,15 +1971,15 @@
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option value="false" type="bool" name="active"/>
-                              <Option value="1" type="int" name="type"/>
-                              <Option value="" type="QString" name="val"/>
+                              <Option type="bool" value="false" name="active"/>
+                              <Option type="int" value="1" name="type"/>
+                              <Option type="QString" value="" name="val"/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -1987,35 +1987,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="210,32,39,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.5" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="210,32,39,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.5" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -2046,36 +2046,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="LastVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="3" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="LastVertex" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -2095,40 +2095,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" type="marker" name="@1@2" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+              <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@1@2">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="210,32,39,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="square" name="cap_style"/>
+                    <Option type="QString" value="210,32,39,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="circle" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="0,0,0,0" name="outline_color"/>
+                    <Option type="QString" value="solid" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -2151,38 +2151,38 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="int" value="1" name="type"/>
+                          <Option type="QString" value="" name="val"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="FirstVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="3" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="FirstVertex" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -2202,40 +2202,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" type="marker" name="@1@3" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+              <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@1@3">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="210,32,39,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="square" name="cap_style"/>
+                    <Option type="QString" value="210,32,39,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="circle" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="0,0,0,0" name="outline_color"/>
+                    <Option type="QString" value="solid" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -2258,58 +2258,58 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="int" value="1" name="type"/>
+                          <Option type="QString" value="" name="val"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol is_animated="0" type="line" name="10" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.26" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0,0,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.26" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -2340,56 +2340,56 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'  THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'  THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" type="line" name="11" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="11">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.46" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0,0,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.46" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -2420,45 +2420,45 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'  THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'  THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" type="line" name="2" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="2">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="500" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="RenderMetersInMapUnits" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="250" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="RenderMetersInMapUnits" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="Interval" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="500" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="RenderMetersInMapUnits" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="250" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="RenderMetersInMapUnits" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="Interval" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -2478,44 +2478,44 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="interval">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="offsetAlongLine">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" type="marker" name="@2@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+              <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@2@0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer locked="0" class="FilledMarker" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="103,34,144,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MapUnit" type="QString" name="offset_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="103,34,144,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="filled_arrowhead" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MapUnit" name="offset_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="103,34,144,255"/>
@@ -2531,32 +2531,32 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol is_animated="0" type="fill" name="@@2@0@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+                  <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@@2@0@0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="103,34,144,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="227,26,28,0" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="103,34,144,255" name="color"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="227,26,28,0" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="103,34,144,255"/>
@@ -2571,15 +2571,15 @@
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option value="false" type="bool" name="active"/>
-                              <Option value="1" type="int" name="type"/>
-                              <Option value="" type="QString" name="val"/>
+                              <Option type="bool" value="false" name="active"/>
+                              <Option type="int" value="1" name="type"/>
+                              <Option type="QString" value="" name="val"/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -2587,35 +2587,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="103,34,144,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.5" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="103,34,144,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.5" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -2646,36 +2646,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="LastVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="3" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="LastVertex" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -2695,40 +2695,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" type="marker" name="@2@2" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+              <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@2@2">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="103,34,144,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="square" name="cap_style"/>
+                    <Option type="QString" value="103,34,144,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="circle" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="0,0,0,0" name="outline_color"/>
+                    <Option type="QString" value="solid" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -2751,38 +2751,38 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="int" value="1" name="type"/>
+                          <Option type="QString" value="" name="val"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="FirstVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="3" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="FirstVertex" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -2802,40 +2802,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" type="marker" name="@2@3" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+              <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@2@3">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="103,34,144,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="square" name="cap_style"/>
+                    <Option type="QString" value="103,34,144,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="circle" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="0,0,0,0" name="outline_color"/>
+                    <Option type="QString" value="solid" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -2858,47 +2858,47 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="int" value="1" name="type"/>
+                          <Option type="QString" value="" name="val"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol is_animated="0" type="line" name="3" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="3">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="500" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="RenderMetersInMapUnits" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="250" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="RenderMetersInMapUnits" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="Interval" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="500" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="RenderMetersInMapUnits" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="250" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="RenderMetersInMapUnits" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="Interval" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -2918,44 +2918,44 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="interval">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="offsetAlongLine">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" type="marker" name="@3@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+              <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@3@0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer locked="0" class="FilledMarker" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="145,211,55,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MapUnit" type="QString" name="offset_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="145,211,55,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="filled_arrowhead" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MapUnit" name="offset_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="145,211,55,255"/>
@@ -2971,32 +2971,32 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol is_animated="0" type="fill" name="@@3@0@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+                  <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@@3@0@0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="145,211,55,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="227,26,28,0" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="145,211,55,255" name="color"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="227,26,28,0" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="145,211,55,255"/>
@@ -3011,15 +3011,15 @@
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option value="false" type="bool" name="active"/>
-                              <Option value="1" type="int" name="type"/>
-                              <Option value="" type="QString" name="val"/>
+                              <Option type="bool" value="false" name="active"/>
+                              <Option type="int" value="1" name="type"/>
+                              <Option type="QString" value="" name="val"/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -3027,35 +3027,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="145,211,55,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.5" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="145,211,55,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.5" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -3086,36 +3086,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="LastVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="3" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="LastVertex" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -3135,40 +3135,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" type="marker" name="@3@2" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+              <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@3@2">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="145,211,55,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="square" name="cap_style"/>
+                    <Option type="QString" value="145,211,55,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="circle" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="0,0,0,0" name="outline_color"/>
+                    <Option type="QString" value="solid" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -3191,38 +3191,38 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="int" value="1" name="type"/>
+                          <Option type="QString" value="" name="val"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="FirstVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="3" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="FirstVertex" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -3242,40 +3242,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" type="marker" name="@3@3" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+              <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@3@3">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="145,211,55,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="square" name="cap_style"/>
+                    <Option type="QString" value="145,211,55,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="circle" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="0,0,0,0" name="outline_color"/>
+                    <Option type="QString" value="solid" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -3298,47 +3298,47 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="int" value="1" name="type"/>
+                          <Option type="QString" value="" name="val"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol is_animated="0" type="line" name="4" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="4">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="500" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="RenderMetersInMapUnits" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="250" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="RenderMetersInMapUnits" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="Interval" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="500" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="RenderMetersInMapUnits" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="250" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="RenderMetersInMapUnits" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="Interval" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -3358,44 +3358,44 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="interval">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="offsetAlongLine">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" type="marker" name="@4@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+              <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@4@0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer locked="0" class="FilledMarker" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="0,72,255,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MapUnit" type="QString" name="offset_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="0,72,255,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="filled_arrowhead" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MapUnit" name="offset_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="0,72,255,255"/>
@@ -3411,32 +3411,32 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol is_animated="0" type="fill" name="@@4@0@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+                  <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@@4@0@0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="0,72,255,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="227,26,28,0" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="0,72,255,255" name="color"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="227,26,28,0" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="0,72,255,255"/>
@@ -3451,15 +3451,15 @@
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option value="false" type="bool" name="active"/>
-                              <Option value="1" type="int" name="type"/>
-                              <Option value="" type="QString" name="val"/>
+                              <Option type="bool" value="false" name="active"/>
+                              <Option type="int" value="1" name="type"/>
+                              <Option type="QString" value="" name="val"/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -3467,35 +3467,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,72,255,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.5" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,72,255,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.5" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -3526,36 +3526,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="LastVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="3" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="LastVertex" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -3575,40 +3575,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" type="marker" name="@4@2" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+              <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@4@2">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="0,72,255,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="square" name="cap_style"/>
+                    <Option type="QString" value="0,72,255,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="circle" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="0,0,0,0" name="outline_color"/>
+                    <Option type="QString" value="solid" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -3631,38 +3631,38 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="int" value="1" name="type"/>
+                          <Option type="QString" value="" name="val"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="FirstVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="3" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="FirstVertex" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -3682,40 +3682,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" type="marker" name="@4@3" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+              <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@4@3">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="0,72,255,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="square" name="cap_style"/>
+                    <Option type="QString" value="0,72,255,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="circle" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="0,0,0,0" name="outline_color"/>
+                    <Option type="QString" value="solid" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -3738,47 +3738,47 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="int" value="1" name="type"/>
+                          <Option type="QString" value="" name="val"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol is_animated="0" type="line" name="5" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="5">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="500" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="RenderMetersInMapUnits" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="250" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="RenderMetersInMapUnits" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="Interval" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="500" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="RenderMetersInMapUnits" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="250" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="RenderMetersInMapUnits" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="Interval" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -3798,44 +3798,44 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="interval">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="offsetAlongLine">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" type="marker" name="@5@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+              <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@5@0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer locked="0" class="FilledMarker" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="0,0,0,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MapUnit" type="QString" name="offset_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="0,0,0,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="filled_arrowhead" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MapUnit" name="offset_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="0,0,0,255"/>
@@ -3851,32 +3851,32 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol is_animated="0" type="fill" name="@@5@0@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+                  <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@@5@0@0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="0,0,0,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="227,26,28,0" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="0,0,0,255" name="color"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="227,26,28,0" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="0,0,0,255"/>
@@ -3891,15 +3891,15 @@
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option value="true" type="bool" name="active"/>
-                              <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                              <Option value="3" type="int" name="type"/>
+                              <Option type="bool" value="true" name="active"/>
+                              <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
+                              <Option type="int" value="3" name="type"/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -3907,35 +3907,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.5" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0,0,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.5" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -3966,36 +3966,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="LastVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="3" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="LastVertex" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -4015,40 +4015,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" type="marker" name="@5@2" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+              <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@5@2">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="0,0,0,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="square" name="cap_style"/>
+                    <Option type="QString" value="0,0,0,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="circle" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="0,0,0,0" name="outline_color"/>
+                    <Option type="QString" value="solid" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -4071,38 +4071,38 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option value="true" type="bool" name="active"/>
-                          <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                          <Option value="3" type="int" name="type"/>
+                          <Option type="bool" value="true" name="active"/>
+                          <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
+                          <Option type="int" value="3" name="type"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="FirstVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="3" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="FirstVertex" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -4122,40 +4122,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" type="marker" name="@5@3" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+              <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@5@3">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="0,0,0,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="square" name="cap_style"/>
+                    <Option type="QString" value="0,0,0,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="circle" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="0,0,0,0" name="outline_color"/>
+                    <Option type="QString" value="solid" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -4178,47 +4178,47 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option value="true" type="bool" name="active"/>
-                          <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                          <Option value="3" type="int" name="type"/>
+                          <Option type="bool" value="true" name="active"/>
+                          <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
+                          <Option type="int" value="3" name="type"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol is_animated="0" type="line" name="6" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="6">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="500" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="RenderMetersInMapUnits" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="250" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="RenderMetersInMapUnits" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="Interval" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="500" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="RenderMetersInMapUnits" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="250" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="RenderMetersInMapUnits" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="Interval" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -4238,44 +4238,44 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="interval">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="offsetAlongLine">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" type="marker" name="@6@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+              <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@6@0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer locked="0" class="FilledMarker" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="210,32,39,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MapUnit" type="QString" name="offset_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="210,32,39,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="filled_arrowhead" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MapUnit" name="offset_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="210,32,39,255"/>
@@ -4291,32 +4291,32 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol is_animated="0" type="fill" name="@@6@0@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+                  <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@@6@0@0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="210,32,39,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="227,26,28,0" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="210,32,39,255" name="color"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="227,26,28,0" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="210,32,39,255"/>
@@ -4331,15 +4331,15 @@
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option value="false" type="bool" name="active"/>
-                              <Option value="1" type="int" name="type"/>
-                              <Option value="" type="QString" name="val"/>
+                              <Option type="bool" value="false" name="active"/>
+                              <Option type="int" value="1" name="type"/>
+                              <Option type="QString" value="" name="val"/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -4347,35 +4347,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="210,32,39,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.5" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="210,32,39,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.5" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -4406,36 +4406,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="LastVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="3" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="LastVertex" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -4455,40 +4455,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" type="marker" name="@6@2" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+              <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@6@2">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="210,32,39,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="square" name="cap_style"/>
+                    <Option type="QString" value="210,32,39,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="circle" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="0,0,0,0" name="outline_color"/>
+                    <Option type="QString" value="solid" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -4511,38 +4511,38 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="int" value="1" name="type"/>
+                          <Option type="QString" value="" name="val"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="FirstVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="3" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="FirstVertex" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -4562,40 +4562,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" type="marker" name="@6@3" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+              <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@6@3">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="210,32,39,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="square" name="cap_style"/>
+                    <Option type="QString" value="210,32,39,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="circle" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="0,0,0,0" name="outline_color"/>
+                    <Option type="QString" value="solid" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -4618,47 +4618,47 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="int" value="1" name="type"/>
+                          <Option type="QString" value="" name="val"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol is_animated="0" type="line" name="7" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="7">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="500" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="RenderMetersInMapUnits" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="250" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="RenderMetersInMapUnits" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="Interval" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="500" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="RenderMetersInMapUnits" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="250" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="RenderMetersInMapUnits" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="Interval" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -4678,44 +4678,44 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="interval">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="offsetAlongLine">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" type="marker" name="@7@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+              <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@7@0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer locked="0" class="FilledMarker" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="103,34,144,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MapUnit" type="QString" name="offset_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="103,34,144,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="filled_arrowhead" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MapUnit" name="offset_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="103,34,144,255"/>
@@ -4731,32 +4731,32 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol is_animated="0" type="fill" name="@@7@0@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+                  <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@@7@0@0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="103,34,144,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="227,26,28,0" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="103,34,144,255" name="color"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="227,26,28,0" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="103,34,144,255"/>
@@ -4771,15 +4771,15 @@
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option value="false" type="bool" name="active"/>
-                              <Option value="1" type="int" name="type"/>
-                              <Option value="" type="QString" name="val"/>
+                              <Option type="bool" value="false" name="active"/>
+                              <Option type="int" value="1" name="type"/>
+                              <Option type="QString" value="" name="val"/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -4787,35 +4787,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="103,34,144,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.5" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="103,34,144,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.5" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -4846,36 +4846,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="LastVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="3" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="LastVertex" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -4895,40 +4895,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" type="marker" name="@7@2" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+              <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@7@2">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="103,34,144,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="square" name="cap_style"/>
+                    <Option type="QString" value="103,34,144,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="circle" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="0,0,0,0" name="outline_color"/>
+                    <Option type="QString" value="solid" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -4951,38 +4951,38 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="int" value="1" name="type"/>
+                          <Option type="QString" value="" name="val"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="FirstVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="3" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="FirstVertex" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -5002,40 +5002,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" type="marker" name="@7@3" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+              <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@7@3">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="103,34,144,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="square" name="cap_style"/>
+                    <Option type="QString" value="103,34,144,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="circle" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="0,0,0,0" name="outline_color"/>
+                    <Option type="QString" value="solid" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -5058,47 +5058,47 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="int" value="1" name="type"/>
+                          <Option type="QString" value="" name="val"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol is_animated="0" type="line" name="8" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="8">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="500" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="RenderMetersInMapUnits" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="250" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="RenderMetersInMapUnits" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="Interval" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="500" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="RenderMetersInMapUnits" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="250" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="RenderMetersInMapUnits" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="Interval" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -5118,44 +5118,44 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="interval">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="offsetAlongLine">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" type="marker" name="@8@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+              <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@8@0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer locked="0" class="FilledMarker" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="145,211,55,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MapUnit" type="QString" name="offset_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="145,211,55,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="filled_arrowhead" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MapUnit" name="offset_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="145,211,55,255"/>
@@ -5171,32 +5171,32 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol is_animated="0" type="fill" name="@@8@0@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+                  <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@@8@0@0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="145,211,55,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="227,26,28,0" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="145,211,55,255" name="color"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="227,26,28,0" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="145,211,55,255"/>
@@ -5211,15 +5211,15 @@
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option value="false" type="bool" name="active"/>
-                              <Option value="1" type="int" name="type"/>
-                              <Option value="" type="QString" name="val"/>
+                              <Option type="bool" value="false" name="active"/>
+                              <Option type="int" value="1" name="type"/>
+                              <Option type="QString" value="" name="val"/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -5227,35 +5227,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="145,211,55,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.5" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="145,211,55,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.5" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -5286,36 +5286,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="LastVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="3" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="LastVertex" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -5335,40 +5335,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" type="marker" name="@8@2" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+              <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@8@2">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="145,211,55,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="square" name="cap_style"/>
+                    <Option type="QString" value="145,211,55,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="circle" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="0,0,0,0" name="outline_color"/>
+                    <Option type="QString" value="solid" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -5391,38 +5391,38 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="int" value="1" name="type"/>
+                          <Option type="QString" value="" name="val"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="FirstVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="3" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="FirstVertex" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -5442,40 +5442,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" type="marker" name="@8@3" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+              <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@8@3">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="145,211,55,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="square" name="cap_style"/>
+                    <Option type="QString" value="145,211,55,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="circle" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="0,0,0,0" name="outline_color"/>
+                    <Option type="QString" value="solid" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -5498,47 +5498,47 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="int" value="1" name="type"/>
+                          <Option type="QString" value="" name="val"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol is_animated="0" type="line" name="9" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="9">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="500" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="RenderMetersInMapUnits" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="250" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="RenderMetersInMapUnits" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="Interval" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="500" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="RenderMetersInMapUnits" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="250" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="RenderMetersInMapUnits" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="Interval" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -5558,44 +5558,44 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="interval">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="offsetAlongLine">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" type="marker" name="@9@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+              <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@9@0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer locked="0" class="FilledMarker" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="0,72,255,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MapUnit" type="QString" name="offset_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="0,72,255,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="filled_arrowhead" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MapUnit" name="offset_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="0,72,255,255"/>
@@ -5611,32 +5611,32 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol is_animated="0" type="fill" name="@@9@0@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+                  <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@@9@0@0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="0,72,255,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="227,26,28,0" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="0,72,255,255" name="color"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="227,26,28,0" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="0,72,255,255"/>
@@ -5651,15 +5651,15 @@
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option value="false" type="bool" name="active"/>
-                              <Option value="1" type="int" name="type"/>
-                              <Option value="" type="QString" name="val"/>
+                              <Option type="bool" value="false" name="active"/>
+                              <Option type="int" value="1" name="type"/>
+                              <Option type="QString" value="" name="val"/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -5667,35 +5667,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,72,255,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.5" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,72,255,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.5" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -5726,36 +5726,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="LastVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="3" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="LastVertex" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -5775,40 +5775,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" type="marker" name="@9@2" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+              <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@9@2">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="0,72,255,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="square" name="cap_style"/>
+                    <Option type="QString" value="0,72,255,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="circle" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="0,0,0,0" name="outline_color"/>
+                    <Option type="QString" value="solid" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -5831,38 +5831,38 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="int" value="1" name="type"/>
+                          <Option type="QString" value="" name="val"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="FirstVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="3" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="FirstVertex" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -5882,40 +5882,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" type="marker" name="@9@3" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+              <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@9@3">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="0,72,255,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="square" name="cap_style"/>
+                    <Option type="QString" value="0,72,255,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="circle" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="0,0,0,0" name="outline_color"/>
+                    <Option type="QString" value="solid" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -5938,15 +5938,15 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="int" value="1" name="type"/>
+                          <Option type="QString" value="" name="val"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
@@ -5960,42 +5960,42 @@
       </renderer-v2>
       <labeling type="rule-based">
         <rules key="{48fee05e-0ef3-420c-825c-567446ab3f47}">
-          <rule active="0" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" description="Active routes" key="{d02d4209-0412-4f31-93a5-7f588ba53e66}">
+          <rule description="Active routes" active="0" key="{d02d4209-0412-4f31-93a5-7f588ba53e66}" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )">
             <settings calloutType="simple">
-              <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="63" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="255,255,255,255" textOpacity="1" fieldName="round($length / 1000, 0)" useSubstitutions="0" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="10" namedStyle="Semibold" forcedItalic="0" isExpression="1" fontSizeUnit="Point" allowHtml="0" legendString="Aa">
+              <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="Semibold" fontUnderline="0" fieldName="round($length / 1000, 0)" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" useSubstitutions="0" fontWeight="63" fontStrikeout="0" fontItalic="0" fontSize="10" allowHtml="0" fontKerning="1" textColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" isExpression="1" legendString="Aa" textOrientation="horizontal">
                 <families/>
-                <text-buffer bufferNoFill="0" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="0"/>
-                <background shapeRadiiY="1" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="0,0,0,255" shapeDraw="1" shapeBorderWidth="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="1" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="0,0,0,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="1" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-                  <symbol is_animated="0" type="marker" name="markerSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+                <text-buffer bufferNoFill="0" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+                <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskType="0"/>
+                <background shapeRadiiY="1" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="0,0,0,255" shapeRotationType="0" shapeSizeX="1" shapeDraw="1" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="0,0,0,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="1">
+                  <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="markerSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                    <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
                       <Option type="Map">
-                        <Option value="0" type="QString" name="angle"/>
-                        <Option value="square" type="QString" name="cap_style"/>
-                        <Option value="164,113,88,255" type="QString" name="color"/>
-                        <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="circle" type="QString" name="name"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="diameter" type="QString" name="scale_method"/>
-                        <Option value="2" type="QString" name="size"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="size_unit"/>
-                        <Option value="1" type="QString" name="vertical_anchor_point"/>
+                        <Option type="QString" value="0" name="angle"/>
+                        <Option type="QString" value="square" name="cap_style"/>
+                        <Option type="QString" value="164,113,88,255" name="color"/>
+                        <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="circle" name="name"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="diameter" name="scale_method"/>
+                        <Option type="QString" value="2" name="size"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="size_unit"/>
+                        <Option type="QString" value="1" name="vertical_anchor_point"/>
                       </Option>
                       <prop k="angle" v="0"/>
                       <prop k="cap_style" v="square"/>
@@ -6018,34 +6018,34 @@
                       <prop k="vertical_anchor_point" v="1"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+                  <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="0,0,0,255" type="QString" name="color"/>
-                        <Option value="round" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="1" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="0,0,0,255" name="color"/>
+                        <Option type="QString" value="round" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="1" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="0,0,0,255"/>
@@ -6060,98 +6060,98 @@
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option value="true" type="bool" name="active"/>
-                              <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                              <Option value="3" type="int" name="type"/>
+                              <Option type="bool" value="true" name="active"/>
+                              <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
+                              <Option type="int" value="3" name="type"/>
                             </Option>
                             <Option type="Map" name="outlineColor">
-                              <Option value="true" type="bool" name="active"/>
-                              <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                              <Option value="3" type="int" name="type"/>
+                              <Option type="bool" value="true" name="active"/>
+                              <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
+                              <Option type="int" value="3" name="type"/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format useMaxLineLengthForAutoWrap="1" leftDirectionSymbol="&lt;" wrapChar="" multilineAlign="0" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" decimals="0" rightDirectionSymbol=">" formatNumbers="0"/>
-              <placement overlapHandling="AllowOverlapIfRequired" lineAnchorType="0" centroidInside="0" overrunDistance="0" centroidWhole="0" geometryGeneratorEnabled="1" rotationAngle="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" geometryGeneratorType="PointGeometry" quadOffset="3" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="0" xOffset="0" allowDegraded="1" lineAnchorTextPoint="CenterOfText" layerType="LineGeometry" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" maxCurvedCharAngleOut="-20" repeatDistance="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" dist="2" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" distUnits="MM" lineAnchorClipping="0" placementFlags="10" priority="10" overrunDistanceUnit="MM" maxCurvedCharAngleIn="20" geometryGenerator="km_marker()" lineAnchorPercent="0.5" yOffset="0" rotationUnit="AngleDegrees"/>
-              <rendering fontMaxPixelSize="10000" drawLabels="1" mergeLines="0" zIndex="0" upsidedownLabels="0" obstacleFactor="2" scaleVisibility="0" limitNumLabels="0" obstacleType="0" fontLimitPixelSize="0" maxNumLabels="2000" minFeatureSize="0" fontMinPixelSize="3" labelPerPart="0" obstacle="1" scaleMax="10000000" scaleMin="1" unplacedVisibility="0"/>
+              <text-format wrapChar="" rightDirectionSymbol=">" plussign="0" leftDirectionSymbol="&lt;" formatNumbers="0" decimals="0" multilineAlign="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
+              <placement offsetUnits="MapUnit" xOffset="0" maxCurvedCharAngleOut="-20" layerType="LineGeometry" allowDegraded="1" yOffset="0" overlapHandling="AllowOverlapIfRequired" geometryGeneratorType="PointGeometry" geometryGeneratorEnabled="1" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" repeatDistanceUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" quadOffset="3" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidWhole="0" overrunDistance="0" overrunDistanceUnit="MM" centroidInside="0" placement="0" geometryGenerator="km_marker()" priority="10" distUnits="MM" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" dist="2" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorTextPoint="CenterOfText" polygonPlacementFlags="2" rotationUnit="AngleDegrees" offsetType="0" placementFlags="10" repeatDistance="0"/>
+              <rendering limitNumLabels="0" obstacleType="0" obstacle="1" scaleMax="10000000" maxNumLabels="2000" labelPerPart="0" scaleMin="1" upsidedownLabels="0" zIndex="0" unplacedVisibility="0" fontLimitPixelSize="0" minFeatureSize="0" fontMaxPixelSize="10000" scaleVisibility="0" fontMinPixelSize="3" drawLabels="1" mergeLines="0" obstacleFactor="2"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="PositionX">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="PositionY">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="PredefinedPositionOrder">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="quadrant" type="QString" name="field"/>
-                      <Option value="2" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="quadrant" name="field"/>
+                      <Option type="int" value="2" name="type"/>
                     </Option>
                     <Option type="Map" name="Rotation">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="rotation" type="QString" name="field"/>
-                      <Option value="2" type="int" name="type"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="QString" value="rotation" name="field"/>
+                      <Option type="int" value="2" name="type"/>
                     </Option>
                     <Option type="Map" name="ShapeBorderColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="ShapeFillColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+                  <Option type="int" value="0" name="blendMode"/>
                   <Option type="Map" name="ddProperties">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
-                  <Option value="false" type="bool" name="drawToAllParts"/>
-                  <Option value="0" type="QString" name="enabled"/>
-                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                  <Option value="&lt;symbol is_animated=&quot;0&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                  <Option value="0" type="double" name="minLength"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                  <Option value="MM" type="QString" name="minLengthUnit"/>
-                  <Option value="0" type="double" name="offsetFromAnchor"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                  <Option value="0" type="double" name="offsetFromLabel"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                  <Option type="bool" value="false" name="drawToAllParts"/>
+                  <Option type="QString" value="0" name="enabled"/>
+                  <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
+                  <Option type="QString" value="&lt;symbol alpha=&quot;1&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
+                  <Option type="double" value="0" name="minLength"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
+                  <Option type="QString" value="MM" name="minLengthUnit"/>
+                  <Option type="double" value="0" name="offsetFromAnchor"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
+                  <Option type="double" value="0" name="offsetFromLabel"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
@@ -6160,17 +6160,19 @@
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="copy" name="QFieldSync/action"/>
+          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
           <Option type="List" name="dualview/previewExpressions">
-            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
           </Option>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="QString" value="0" name="embeddedWidgets/count"/>
           <Option type="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -6178,48 +6180,48 @@
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory penAlpha="255" width="15" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" minimumSize="0" enabled="0" maxScaleDenominator="1e+08" diagramOrientation="Up" opacity="1" scaleBasedVisibility="0" spacingUnit="MM" minScaleDenominator="100000" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" lineSizeType="MM" penWidth="0" backgroundAlpha="255" scaleDependency="Area" spacing="0" direction="1" barWidth="5" sizeType="MM" height="15" penColor="#000000" showAxis="0">
-          <fontProperties bold="0" style="" italic="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0"/>
-          <attribute label="" colorOpacity="1" field="" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory height="15" scaleDependency="Area" width="15" lineSizeScale="3x:0,0,0,0,0,0" spacingUnit="MM" lineSizeType="MM" penColor="#000000" spacing="0" labelPlacementMethod="XHeight" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" backgroundAlpha="255" maxScaleDenominator="1e+08" barWidth="5" penWidth="0" minimumSize="0" penAlpha="255" minScaleDenominator="100000" sizeType="MM" backgroundColor="#ffffff" enabled="0" opacity="1" direction="1" scaleBasedVisibility="0" showAxis="0" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270">
+          <fontProperties style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0" strikethrough="0" italic="0" underline="0" bold="0"/>
+          <attribute color="#000000" field="" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="35,35,35,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0.26" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -6250,9 +6252,9 @@
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -6260,28 +6262,28 @@
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="2" showAll="1" placement="2" zIndex="0" dist="0" priority="0" obstacle="0">
+      <DiagramLayerSettings priority="0" linePlacementFlags="2" obstacle="0" dist="0" zIndex="0" placement="2" showAll="1">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field configurationFlags="None" name="Name">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -6290,8 +6292,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -6300,8 +6302,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -6310,8 +6312,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -6320,8 +6322,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -6330,8 +6332,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -6340,8 +6342,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -6350,8 +6352,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -6374,8 +6376,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -6384,91 +6386,91 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="Name"/>
-        <alias index="1" name="" field="descriptio"/>
-        <alias index="2" name="" field="timestamp"/>
-        <alias index="3" name="" field="begin"/>
-        <alias index="4" name="" field="end"/>
-        <alias index="5" name="" field="Distance"/>
-        <alias index="6" name="" field="RouteLen"/>
-        <alias index="7" name="" field="Source"/>
-        <alias index="8" name="" field="Sort"/>
-        <alias index="9" name="" field="day"/>
-        <alias index="10" name="" field="length_km"/>
-        <alias index="11" name="" field="length_m"/>
+        <alias index="0" field="Name" name=""/>
+        <alias index="1" field="descriptio" name=""/>
+        <alias index="2" field="timestamp" name=""/>
+        <alias index="3" field="begin" name=""/>
+        <alias index="4" field="end" name=""/>
+        <alias index="5" field="Distance" name=""/>
+        <alias index="6" field="RouteLen" name=""/>
+        <alias index="7" field="Source" name=""/>
+        <alias index="8" field="Sort" name=""/>
+        <alias index="9" field="day" name=""/>
+        <alias index="10" field="length_km" name=""/>
+        <alias index="11" field="length_m" name=""/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="Name"/>
-        <default applyOnUpdate="0" expression="" field="descriptio"/>
-        <default applyOnUpdate="0" expression="" field="timestamp"/>
-        <default applyOnUpdate="0" expression="" field="begin"/>
-        <default applyOnUpdate="0" expression="" field="end"/>
-        <default applyOnUpdate="0" expression="" field="Distance"/>
-        <default applyOnUpdate="0" expression="" field="RouteLen"/>
-        <default applyOnUpdate="0" expression="" field="Source"/>
-        <default applyOnUpdate="0" expression="" field="Sort"/>
-        <default applyOnUpdate="0" expression="" field="day"/>
-        <default applyOnUpdate="0" expression="" field="length_km"/>
-        <default applyOnUpdate="0" expression="" field="length_m"/>
+        <default applyOnUpdate="0" field="Name" expression=""/>
+        <default applyOnUpdate="0" field="descriptio" expression=""/>
+        <default applyOnUpdate="0" field="timestamp" expression=""/>
+        <default applyOnUpdate="0" field="begin" expression=""/>
+        <default applyOnUpdate="0" field="end" expression=""/>
+        <default applyOnUpdate="0" field="Distance" expression=""/>
+        <default applyOnUpdate="0" field="RouteLen" expression=""/>
+        <default applyOnUpdate="0" field="Source" expression=""/>
+        <default applyOnUpdate="0" field="Sort" expression=""/>
+        <default applyOnUpdate="0" field="day" expression=""/>
+        <default applyOnUpdate="0" field="length_km" expression=""/>
+        <default applyOnUpdate="0" field="length_m" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="Name" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="descriptio" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="timestamp" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="begin" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="end" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="Distance" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="RouteLen" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="Source" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="Sort" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="day" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="length_km" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="length_m" constraints="0"/>
+        <constraint exp_strength="0" field="Name" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="descriptio" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="timestamp" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="begin" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="end" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="Distance" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="RouteLen" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="Source" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="Sort" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="day" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="length_km" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="length_m" notnull_strength="0" constraints="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" desc="" field="Name"/>
-        <constraint exp="" desc="" field="descriptio"/>
-        <constraint exp="" desc="" field="timestamp"/>
-        <constraint exp="" desc="" field="begin"/>
-        <constraint exp="" desc="" field="end"/>
-        <constraint exp="" desc="" field="Distance"/>
-        <constraint exp="" desc="" field="RouteLen"/>
-        <constraint exp="" desc="" field="Source"/>
-        <constraint exp="" desc="" field="Sort"/>
-        <constraint exp="" desc="" field="day"/>
-        <constraint exp="" desc="" field="length_km"/>
-        <constraint exp="" desc="" field="length_m"/>
+        <constraint exp="" field="Name" desc=""/>
+        <constraint exp="" field="descriptio" desc=""/>
+        <constraint exp="" field="timestamp" desc=""/>
+        <constraint exp="" field="begin" desc=""/>
+        <constraint exp="" field="end" desc=""/>
+        <constraint exp="" field="Distance" desc=""/>
+        <constraint exp="" field="RouteLen" desc=""/>
+        <constraint exp="" field="Source" desc=""/>
+        <constraint exp="" field="Sort" desc=""/>
+        <constraint exp="" field="day" desc=""/>
+        <constraint exp="" field="length_km" desc=""/>
+        <constraint exp="" field="length_m" desc=""/>
       </constraintExpressions>
       <expressionfields>
-        <field typeName="double precision" subType="0" type="6" name="length_km" precision="0" expression="$length * 100" length="-1" comment=""/>
-        <field typeName="double precision" subType="0" type="6" name="length_m" precision="0" expression="$length * 100 * 1000" length="-1" comment=""/>
+        <field precision="0" comment="" type="6" expression="$length * 100" length="-1" subType="0" typeName="double precision" name="length_km"/>
+        <field precision="0" comment="" type="6" expression="$length * 100 * 1000" length="-1" subType="0" typeName="double precision" name="length_m"/>
       </expressionfields>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="1" sortExpression="&quot;length_m&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="&quot;length_m&quot;" sortOrder="1" actionWidgetStyle="dropDown">
         <columns>
-          <column width="152" type="field" name="Name" hidden="0"/>
-          <column width="-1" type="field" name="descriptio" hidden="0"/>
-          <column width="-1" type="field" name="timestamp" hidden="0"/>
-          <column width="163" type="field" name="begin" hidden="0"/>
-          <column width="-1" type="field" name="end" hidden="0"/>
-          <column width="-1" type="field" name="Distance" hidden="0"/>
+          <column width="152" type="field" hidden="0" name="Name"/>
+          <column width="-1" type="field" hidden="0" name="descriptio"/>
+          <column width="-1" type="field" hidden="0" name="timestamp"/>
+          <column width="163" type="field" hidden="0" name="begin"/>
+          <column width="-1" type="field" hidden="0" name="end"/>
+          <column width="-1" type="field" hidden="0" name="Distance"/>
           <column width="-1" type="actions" hidden="1"/>
-          <column width="-1" type="field" name="RouteLen" hidden="0"/>
-          <column width="-1" type="field" name="Source" hidden="0"/>
-          <column width="188" type="field" name="length_m" hidden="0"/>
-          <column width="-1" type="field" name="Sort" hidden="0"/>
-          <column width="-1" type="field" name="day" hidden="0"/>
-          <column width="266" type="field" name="length_km" hidden="0"/>
+          <column width="-1" type="field" hidden="0" name="RouteLen"/>
+          <column width="-1" type="field" hidden="0" name="Source"/>
+          <column width="188" type="field" hidden="0" name="length_m"/>
+          <column width="-1" type="field" hidden="0" name="Sort"/>
+          <column width="-1" type="field" hidden="0" name="day"/>
+          <column width="266" type="field" hidden="0" name="length_km"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -6500,53 +6502,53 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="Distance" editable="1"/>
-        <field name="Name" editable="1"/>
-        <field name="RouteLen" editable="1"/>
-        <field name="Sort" editable="1"/>
-        <field name="Source" editable="1"/>
-        <field name="begin" editable="1"/>
-        <field name="day" editable="1"/>
-        <field name="descriptio" editable="1"/>
-        <field name="end" editable="1"/>
-        <field name="length_km" editable="0"/>
-        <field name="length_m" editable="0"/>
-        <field name="timestamp" editable="1"/>
+        <field editable="1" name="Distance"/>
+        <field editable="1" name="Name"/>
+        <field editable="1" name="RouteLen"/>
+        <field editable="1" name="Sort"/>
+        <field editable="1" name="Source"/>
+        <field editable="1" name="begin"/>
+        <field editable="1" name="day"/>
+        <field editable="1" name="descriptio"/>
+        <field editable="1" name="end"/>
+        <field editable="0" name="length_km"/>
+        <field editable="0" name="length_m"/>
+        <field editable="1" name="timestamp"/>
       </editable>
       <labelOnTop>
-        <field name="Distance" labelOnTop="0"/>
-        <field name="Name" labelOnTop="0"/>
-        <field name="RouteLen" labelOnTop="0"/>
-        <field name="Sort" labelOnTop="0"/>
-        <field name="Source" labelOnTop="0"/>
-        <field name="begin" labelOnTop="0"/>
-        <field name="day" labelOnTop="0"/>
-        <field name="descriptio" labelOnTop="0"/>
-        <field name="end" labelOnTop="0"/>
-        <field name="length_km" labelOnTop="0"/>
-        <field name="length_m" labelOnTop="0"/>
-        <field name="timestamp" labelOnTop="0"/>
+        <field labelOnTop="0" name="Distance"/>
+        <field labelOnTop="0" name="Name"/>
+        <field labelOnTop="0" name="RouteLen"/>
+        <field labelOnTop="0" name="Sort"/>
+        <field labelOnTop="0" name="Source"/>
+        <field labelOnTop="0" name="begin"/>
+        <field labelOnTop="0" name="day"/>
+        <field labelOnTop="0" name="descriptio"/>
+        <field labelOnTop="0" name="end"/>
+        <field labelOnTop="0" name="length_km"/>
+        <field labelOnTop="0" name="length_m"/>
+        <field labelOnTop="0" name="timestamp"/>
       </labelOnTop>
       <reuseLastValue>
-        <field name="Distance" reuseLastValue="0"/>
-        <field name="Name" reuseLastValue="0"/>
-        <field name="RouteLen" reuseLastValue="0"/>
-        <field name="Sort" reuseLastValue="0"/>
-        <field name="Source" reuseLastValue="0"/>
-        <field name="begin" reuseLastValue="0"/>
-        <field name="day" reuseLastValue="0"/>
-        <field name="descriptio" reuseLastValue="0"/>
-        <field name="end" reuseLastValue="0"/>
-        <field name="length_km" reuseLastValue="0"/>
-        <field name="length_m" reuseLastValue="0"/>
-        <field name="timestamp" reuseLastValue="0"/>
+        <field reuseLastValue="0" name="Distance"/>
+        <field reuseLastValue="0" name="Name"/>
+        <field reuseLastValue="0" name="RouteLen"/>
+        <field reuseLastValue="0" name="Sort"/>
+        <field reuseLastValue="0" name="Source"/>
+        <field reuseLastValue="0" name="begin"/>
+        <field reuseLastValue="0" name="day"/>
+        <field reuseLastValue="0" name="descriptio"/>
+        <field reuseLastValue="0" name="end"/>
+        <field reuseLastValue="0" name="length_km"/>
+        <field reuseLastValue="0" name="length_m"/>
+        <field reuseLastValue="0" name="timestamp"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" simplifyLocal="1" autoRefreshTime="0" wkbType="MultiLineString" simplifyDrawingHints="1" type="vector" symbologyReferenceScale="-1" minScale="100000000" legendPlaceholderImage="" refreshOnNotifyEnabled="0" labelsEnabled="0" maxScale="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" refreshOnNotifyMessage="" readOnly="0" geometry="Line" autoRefreshEnabled="0" simplifyDrawingTol="1">
+    <maplayer simplifyLocal="1" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1" legendPlaceholderImage="" symbologyReferenceScale="-1" readOnly="0" refreshOnNotifyEnabled="0" minScale="100000000" maxScale="0" type="vector" autoRefreshTime="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="0" styleCategories="AllStyleCategories" geometry="Line" autoRefreshEnabled="0" wkbType="MultiLineString">
       <extent>
         <xmin>17.99958333333333371</xmin>
         <ymin>-34.00041666666666629</ymin>
@@ -6619,58 +6621,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" startExpression="" mode="0" limitMode="0" endField="" fixedDuration="0" accumulate="0" durationUnit="min" startField="" endExpression="" enabled="0">
+      <temporal durationField="" fixedDuration="0" accumulate="0" endField="" startField="" enabled="0" startExpression="" endExpression="" durationUnit="min" mode="0" limitMode="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" zscale="1" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" binding="Centroid" type="IndividualFeatures" symbology="Line" extrusion="0" zoffset="0">
+      <elevation extrusionEnabled="0" symbology="Line" type="IndividualFeatures" zscale="1" clamping="Terrain" showMarkerSymbolInSurfacePlots="0" zoffset="0" extrusion="0" respectLayerSymbol="1" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="196,60,57,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="196,60,57,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -6701,36 +6703,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="196,60,57,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="140,43,41,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="196,60,57,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="140,43,41,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="196,60,57,255"/>
@@ -6745,44 +6747,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="196,60,57,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="140,43,41,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="196,60,57,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="diamond" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="140,43,41,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="3" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -6805,54 +6807,54 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" type="singleSymbol" symbollevels="0" referencescale="-1" enableorderby="0">
+      <renderer-v2 enableorderby="0" type="singleSymbol" symbollevels="0" referencescale="-1" forceraster="0">
         <symbols>
-          <symbol is_animated="0" type="line" name="0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="183,72,75,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.26" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="183,72,75,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.26" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -6883,9 +6885,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -6896,19 +6898,19 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="copy" name="QFieldSync/action"/>
+          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field configurationFlags="None" name="ID">
@@ -6934,30 +6936,30 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="ID"/>
-        <alias index="1" name="" field="height"/>
-        <alias index="2" name="" field="elevation"/>
+        <alias index="0" field="ID" name=""/>
+        <alias index="1" field="height" name=""/>
+        <alias index="2" field="elevation" name=""/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="ID"/>
-        <default applyOnUpdate="0" expression="" field="height"/>
-        <default applyOnUpdate="0" expression="" field="elevation"/>
+        <default applyOnUpdate="0" field="ID" expression=""/>
+        <default applyOnUpdate="0" field="height" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="ID" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="height" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="elevation" constraints="0"/>
+        <constraint exp_strength="0" field="ID" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="height" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="elevation" notnull_strength="0" constraints="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" desc="" field="ID"/>
-        <constraint exp="" desc="" field="height"/>
-        <constraint exp="" desc="" field="elevation"/>
+        <constraint exp="" field="ID" desc=""/>
+        <constraint exp="" field="height" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns/>
       </attributetableconfig>
       <conditionalstyles>
@@ -6980,7 +6982,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" simplifyLocal="1" autoRefreshTime="0" wkbType="Polygon" simplifyDrawingHints="1" type="vector" symbologyReferenceScale="-1" minScale="100000000" legendPlaceholderImage="" refreshOnNotifyEnabled="0" labelsEnabled="0" maxScale="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" refreshOnNotifyMessage="" readOnly="0" geometry="Polygon" autoRefreshEnabled="0" simplifyDrawingTol="1">
+    <maplayer simplifyLocal="1" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1" legendPlaceholderImage="" symbologyReferenceScale="-1" readOnly="0" refreshOnNotifyEnabled="0" minScale="100000000" maxScale="0" type="vector" autoRefreshTime="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="0" styleCategories="AllStyleCategories" geometry="Polygon" autoRefreshEnabled="0" wkbType="Polygon">
       <extent>
         <xmin>18.36924763341120581</xmin>
         <ymin>-33.95871753779982782</ymin>
@@ -7055,58 +7057,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" startExpression="" mode="0" limitMode="0" endField="" fixedDuration="0" accumulate="0" durationUnit="min" startField="" endExpression="" enabled="0">
+      <temporal durationField="" fixedDuration="0" accumulate="0" endField="" startField="" enabled="0" startExpression="" endExpression="" durationUnit="min" mode="0" limitMode="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" zscale="1" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" binding="Centroid" type="IndividualFeatures" symbology="Line" extrusion="0" zoffset="0">
+      <elevation extrusionEnabled="0" symbology="Line" type="IndividualFeatures" zscale="1" clamping="Terrain" showMarkerSymbolInSurfacePlots="0" zoffset="0" extrusion="0" respectLayerSymbol="1" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="133,182,111,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="133,182,111,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -7137,36 +7139,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="133,182,111,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="95,130,79,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="133,182,111,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="95,130,79,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="133,182,111,255"/>
@@ -7181,44 +7183,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="133,182,111,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="95,130,79,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="133,182,111,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="diamond" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="95,130,79,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="3" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -7241,38 +7243,38 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" type="singleSymbol" symbollevels="0" referencescale="-1" enableorderby="0">
+      <renderer-v2 enableorderby="0" type="singleSymbol" symbollevels="0" referencescale="-1" forceraster="0">
         <symbols>
-          <symbol is_animated="0" type="fill" name="0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="225,89,137,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="225,89,137,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.26" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="225,89,137,255"/>
@@ -7287,9 +7289,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -7300,21 +7302,21 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="no_action" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="no_action" name="QFieldSync/action"/>
+          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks type="StringList">
-          <Option value="" type="QString"/>
+          <Option type="QString" value=""/>
         </activeChecks>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field configurationFlags="None" name="id">
@@ -7347,34 +7349,34 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
-        <alias index="1" name="" field="type"/>
-        <alias index="2" name="" field="page"/>
-        <alias index="3" name="" field="day"/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="type" name=""/>
+        <alias index="2" field="page" name=""/>
+        <alias index="3" field="day" name=""/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="type"/>
-        <default applyOnUpdate="0" expression="" field="page"/>
-        <default applyOnUpdate="0" expression="" field="day"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="type" expression=""/>
+        <default applyOnUpdate="0" field="page" expression=""/>
+        <default applyOnUpdate="0" field="day" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="id" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="type" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="page" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="day" constraints="0"/>
+        <constraint exp_strength="0" field="id" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="type" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="page" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="day" notnull_strength="0" constraints="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" desc="" field="id"/>
-        <constraint exp="" desc="" field="type"/>
-        <constraint exp="" desc="" field="page"/>
-        <constraint exp="" desc="" field="day"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="type" desc=""/>
+        <constraint exp="" field="page" desc=""/>
+        <constraint exp="" field="day" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns/>
       </attributetableconfig>
       <conditionalstyles>
@@ -7397,7 +7399,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" simplifyLocal="1" autoRefreshTime="0" wkbType="MultiLineString" simplifyDrawingHints="1" type="vector" symbologyReferenceScale="-1" minScale="100000000" legendPlaceholderImage="" refreshOnNotifyEnabled="0" labelsEnabled="1" maxScale="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" refreshOnNotifyMessage="" readOnly="0" geometry="Line" autoRefreshEnabled="0" simplifyDrawingTol="1">
+    <maplayer simplifyLocal="1" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1" legendPlaceholderImage="" symbologyReferenceScale="-1" readOnly="0" refreshOnNotifyEnabled="0" minScale="100000000" maxScale="0" type="vector" autoRefreshTime="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="1" styleCategories="AllStyleCategories" geometry="Line" autoRefreshEnabled="0" wkbType="MultiLineString">
       <extent>
         <xmin>18.41275838185438474</xmin>
         <ymin>-33.90124710387746632</ymin>
@@ -7462,7 +7464,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxy="0" minz="0" dimensions="2" maxx="0" maxz="0" miny="0" minx="0" crs=""/>
+          <spatial maxz="0" minx="0" maxx="0" minz="0" crs="" miny="0" maxy="0" dimensions="2"/>
           <temporal>
             <period>
               <start></start>
@@ -7487,58 +7489,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" startExpression="" mode="0" limitMode="0" endField="" fixedDuration="0" accumulate="0" durationUnit="min" startField="" endExpression="" enabled="0">
+      <temporal durationField="" fixedDuration="0" accumulate="0" endField="" startField="" enabled="0" startExpression="" endExpression="" durationUnit="min" mode="0" limitMode="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" zscale="1" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" binding="Centroid" type="IndividualFeatures" symbology="Line" extrusion="0" zoffset="0">
+      <elevation extrusionEnabled="0" symbology="Line" type="IndividualFeatures" zscale="1" clamping="Terrain" showMarkerSymbolInSurfacePlots="0" zoffset="0" extrusion="0" respectLayerSymbol="1" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="190,178,151,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="190,178,151,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -7569,36 +7571,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="190,178,151,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="136,127,108,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="190,178,151,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="136,127,108,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="190,178,151,255"/>
@@ -7613,44 +7615,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="190,178,151,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="136,127,108,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="190,178,151,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="diamond" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="136,127,108,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="3" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -7673,54 +7675,54 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" type="singleSymbol" symbollevels="0" referencescale="-1" enableorderby="0">
+      <renderer-v2 enableorderby="0" type="singleSymbol" symbollevels="0" referencescale="-1" forceraster="0">
         <symbols>
-          <symbol is_animated="0" type="line" name="0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,85,255,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="1" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,85,255,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="1" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -7751,9 +7753,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -7764,32 +7766,32 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="63" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="1" fieldName="Name" useSubstitutions="0" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="10" namedStyle="Semibold" forcedItalic="0" isExpression="0" fontSizeUnit="Point" allowHtml="0" legendString="Aa">
+          <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="Semibold" fontUnderline="0" fieldName="Name" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" useSubstitutions="0" fontWeight="63" fontStrikeout="0" fontItalic="0" fontSize="10" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" isExpression="0" legendString="Aa" textOrientation="horizontal">
             <families/>
-            <text-buffer bufferNoFill="1" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferDraw="1" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="0"/>
-            <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeBorderWidth="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-              <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <text-buffer bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+            <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskType="0"/>
+            <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
+              <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                    <Option value="255,255,255,255" type="QString" name="color"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                    <Option value="no" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="solid" type="QString" name="style"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                    <Option type="QString" value="255,255,255,255" name="color"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                    <Option type="QString" value="no" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="solid" name="style"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -7804,67 +7806,67 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+            <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format useMaxLineLengthForAutoWrap="1" leftDirectionSymbol="&lt;" wrapChar="" multilineAlign="0" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" decimals="3" rightDirectionSymbol=">" formatNumbers="0"/>
-          <placement overlapHandling="PreventOverlap" lineAnchorType="0" centroidInside="0" overrunDistance="0" centroidWhole="0" geometryGeneratorEnabled="0" rotationAngle="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" geometryGeneratorType="LineGeometry" quadOffset="4" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="2" xOffset="0" allowDegraded="0" lineAnchorTextPoint="CenterOfText" layerType="UnknownGeometry" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" maxCurvedCharAngleOut="-25" repeatDistance="0" offsetUnits="MM" repeatDistanceUnits="MM" dist="2" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" distUnits="MM" lineAnchorClipping="0" placementFlags="10" priority="5" overrunDistanceUnit="MM" maxCurvedCharAngleIn="25" geometryGenerator="" lineAnchorPercent="0.5" yOffset="0" rotationUnit="AngleDegrees"/>
-          <rendering fontMaxPixelSize="10000" drawLabels="1" mergeLines="0" zIndex="0" upsidedownLabels="0" obstacleFactor="1" scaleVisibility="0" limitNumLabels="0" obstacleType="0" fontLimitPixelSize="0" maxNumLabels="2000" minFeatureSize="0" fontMinPixelSize="3" labelPerPart="0" obstacle="1" scaleMax="0" scaleMin="0" unplacedVisibility="0"/>
+          <text-format wrapChar="" rightDirectionSymbol=">" plussign="0" leftDirectionSymbol="&lt;" formatNumbers="0" decimals="3" multilineAlign="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
+          <placement offsetUnits="MM" xOffset="0" maxCurvedCharAngleOut="-25" layerType="UnknownGeometry" allowDegraded="0" yOffset="0" overlapHandling="PreventOverlap" geometryGeneratorType="LineGeometry" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" repeatDistanceUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25" quadOffset="4" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidWhole="0" overrunDistance="0" overrunDistanceUnit="MM" centroidInside="0" placement="2" geometryGenerator="" priority="5" distUnits="MM" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" dist="2" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorTextPoint="CenterOfText" polygonPlacementFlags="2" rotationUnit="AngleDegrees" offsetType="0" placementFlags="10" repeatDistance="0"/>
+          <rendering limitNumLabels="0" obstacleType="0" obstacle="1" scaleMax="0" maxNumLabels="2000" labelPerPart="0" scaleMin="0" upsidedownLabels="0" zIndex="0" unplacedVisibility="0" fontLimitPixelSize="0" minFeatureSize="0" fontMaxPixelSize="10000" scaleVisibility="0" fontMinPixelSize="3" drawLabels="1" mergeLines="0" obstacleFactor="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-              <Option value="0" type="int" name="blendMode"/>
+              <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+              <Option type="int" value="0" name="blendMode"/>
               <Option type="Map" name="ddProperties">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
-              <Option value="false" type="bool" name="drawToAllParts"/>
-              <Option value="0" type="QString" name="enabled"/>
-              <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-              <Option value="&lt;symbol is_animated=&quot;0&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-              <Option value="0" type="double" name="minLength"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-              <Option value="MM" type="QString" name="minLengthUnit"/>
-              <Option value="0" type="double" name="offsetFromAnchor"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-              <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-              <Option value="0" type="double" name="offsetFromLabel"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-              <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+              <Option type="bool" value="false" name="drawToAllParts"/>
+              <Option type="QString" value="0" name="enabled"/>
+              <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
+              <Option type="QString" value="&lt;symbol alpha=&quot;1&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
+              <Option type="double" value="0" name="minLength"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
+              <Option type="QString" value="MM" name="minLengthUnit"/>
+              <Option type="double" value="0" name="offsetFromAnchor"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
+              <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
+              <Option type="double" value="0" name="offsetFromLabel"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
+              <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option value="Name" type="QString" name="dualview/previewExpressions"/>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="QString" value="copy" name="QFieldSync/action"/>
+          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="Name" name="dualview/previewExpressions"/>
+          <Option type="QString" value="0" name="embeddedWidgets/count"/>
           <Option type="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -7872,48 +7874,48 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory penAlpha="255" width="15" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" minimumSize="0" enabled="0" maxScaleDenominator="1e+08" diagramOrientation="Up" opacity="1" scaleBasedVisibility="0" spacingUnit="MM" minScaleDenominator="0" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" lineSizeType="MM" penWidth="0" backgroundAlpha="255" scaleDependency="Area" spacing="0" direction="1" barWidth="5" sizeType="MM" height="15" penColor="#000000" showAxis="0">
-          <fontProperties bold="0" style="" italic="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0"/>
-          <attribute label="" colorOpacity="1" field="" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory height="15" scaleDependency="Area" width="15" lineSizeScale="3x:0,0,0,0,0,0" spacingUnit="MM" lineSizeType="MM" penColor="#000000" spacing="0" labelPlacementMethod="XHeight" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" backgroundAlpha="255" maxScaleDenominator="1e+08" barWidth="5" penWidth="0" minimumSize="0" penAlpha="255" minScaleDenominator="0" sizeType="MM" backgroundColor="#ffffff" enabled="0" opacity="1" direction="1" scaleBasedVisibility="0" showAxis="0" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270">
+          <fontProperties style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0" strikethrough="0" italic="0" underline="0" bold="0"/>
+          <attribute color="#000000" field="" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="35,35,35,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0.26" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -7944,9 +7946,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -7954,20 +7956,20 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" showAll="1" placement="2" zIndex="0" dist="0" priority="0" obstacle="0">
+      <DiagramLayerSettings priority="0" linePlacementFlags="18" obstacle="0" dist="0" zIndex="0" placement="2" showAll="1">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field configurationFlags="None" name="id">
@@ -7986,29 +7988,29 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
-        <alias index="1" name="" field="Name"/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="Name" name=""/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="Name"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="Name" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="id" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="Name" constraints="0"/>
+        <constraint exp_strength="0" field="id" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="Name" notnull_strength="0" constraints="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" desc="" field="id"/>
-        <constraint exp="" desc="" field="Name"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="Name" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column width="-1" type="field" name="id" hidden="0"/>
-          <column width="-1" type="field" name="Name" hidden="0"/>
+          <column width="-1" type="field" hidden="0" name="id"/>
+          <column width="-1" type="field" hidden="0" name="Name"/>
           <column width="-1" type="actions" hidden="1"/>
         </columns>
       </attributetableconfig>
@@ -8041,12 +8043,12 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="Name" editable="1"/>
-        <field name="id" editable="1"/>
+        <field editable="1" name="Name"/>
+        <field editable="1" name="id"/>
       </editable>
       <labelOnTop>
-        <field name="Name" labelOnTop="0"/>
-        <field name="id" labelOnTop="0"/>
+        <field labelOnTop="0" name="Name"/>
+        <field labelOnTop="0" name="id"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -8054,7 +8056,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>Name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" simplifyLocal="1" autoRefreshTime="0" wkbType="MultiLineString" simplifyDrawingHints="0" type="vector" symbologyReferenceScale="-1" minScale="100000000" legendPlaceholderImage="" refreshOnNotifyEnabled="0" labelsEnabled="0" maxScale="100000" styleCategories="AllStyleCategories" simplifyAlgorithm="0" refreshOnNotifyMessage="" readOnly="0" geometry="Line" autoRefreshEnabled="0" simplifyDrawingTol="1">
+    <maplayer simplifyLocal="1" simplifyDrawingHints="0" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1" legendPlaceholderImage="" symbologyReferenceScale="-1" readOnly="0" refreshOnNotifyEnabled="0" minScale="100000000" maxScale="100000" type="vector" autoRefreshTime="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="0" styleCategories="AllStyleCategories" geometry="Line" autoRefreshEnabled="0" wkbType="MultiLineString">
       <extent>
         <xmin>18.40814103070666974</xmin>
         <ymin>-33.90827185075657724</ymin>
@@ -8119,7 +8121,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxy="0" minz="0" dimensions="2" maxx="0" maxz="0" miny="0" minx="0" crs=""/>
+          <spatial maxz="0" minx="0" maxx="0" minz="0" crs="" miny="0" maxy="0" dimensions="2"/>
           <temporal>
             <period>
               <start></start>
@@ -8144,58 +8146,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" startExpression="" mode="0" limitMode="0" endField="" fixedDuration="0" accumulate="0" durationUnit="min" startField="" endExpression="" enabled="0">
+      <temporal durationField="" fixedDuration="0" accumulate="0" endField="" startField="" enabled="0" startExpression="" endExpression="" durationUnit="min" mode="0" limitMode="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" zscale="1" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" binding="Centroid" type="IndividualFeatures" symbology="Line" extrusion="0" zoffset="0">
+      <elevation extrusionEnabled="0" symbology="Line" type="IndividualFeatures" zscale="1" clamping="Terrain" showMarkerSymbolInSurfacePlots="0" zoffset="0" extrusion="0" respectLayerSymbol="1" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="145,82,45,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="145,82,45,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -8226,36 +8228,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="145,82,45,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="104,59,32,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="145,82,45,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="104,59,32,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="145,82,45,255"/>
@@ -8270,44 +8272,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="145,82,45,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="104,59,32,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="145,82,45,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="diamond" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="104,59,32,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="3" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -8330,48 +8332,48 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" type="RuleRenderer" symbollevels="0" referencescale="-1" enableorderby="0">
+      <renderer-v2 enableorderby="0" type="RuleRenderer" symbollevels="0" referencescale="-1" forceraster="0">
         <rules key="{cdec7d40-64aa-438c-9c37-b3d2a98670e7}">
-          <rule filter="&quot;distance&quot; = '21KM'" description="Only show when active in Atlas" symbol="0" label="21KM" key="{85adf11b-f941-44b6-8847-c828ab845cdc}"/>
-          <rule filter="&quot;distance&quot; = '10KM'" description="Only show when active in Atlas" symbol="1" label="10KM" key="{78aff69a-52d7-4875-b2ae-48b907117fa1}"/>
-          <rule filter="&quot;distance&quot; = '5KM'" description="Only show when active in Atlas" symbol="2" label="5KM" key="{cf733f0f-ab72-441e-b213-841aa39c1671}"/>
+          <rule description="Only show when active in Atlas" symbol="0" label="21KM" key="{85adf11b-f941-44b6-8847-c828ab845cdc}" filter="&quot;distance&quot; = '21KM'"/>
+          <rule description="Only show when active in Atlas" symbol="1" label="10KM" key="{78aff69a-52d7-4875-b2ae-48b907117fa1}" filter="&quot;distance&quot; = '10KM'"/>
+          <rule description="Only show when active in Atlas" symbol="2" label="5KM" key="{cf733f0f-ab72-441e-b213-841aa39c1671}" filter="&quot;distance&quot; = '5KM'"/>
         </rules>
         <symbols>
-          <symbol is_animated="0" type="line" name="0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="LastVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="3" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="LastVertex" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -8391,40 +8393,40 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" type="marker" name="@0@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+              <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@0@0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="210,32,39,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="miter" type="QString" name="joinstyle"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="210,32,39,255" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0.5" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="area" type="QString" name="scale_method"/>
-                    <Option value="3" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="square" name="cap_style"/>
+                    <Option type="QString" value="210,32,39,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="miter" name="joinstyle"/>
+                    <Option type="QString" value="filled_arrowhead" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="210,32,39,255" name="outline_color"/>
+                    <Option type="QString" value="solid" name="outline_style"/>
+                    <Option type="QString" value="0.5" name="outline_width"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="area" name="scale_method"/>
+                    <Option type="QString" value="3" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -8447,32 +8449,32 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="250" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="100" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="Interval" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="250" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="100" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="Interval" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -8492,44 +8494,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="interval">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="offsetAlongLine">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" type="marker" name="@0@1" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+              <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@0@1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer locked="0" class="FilledMarker" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="210,32,39,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MapUnit" type="QString" name="offset_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="3" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="210,32,39,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="filled_arrowhead" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MapUnit" name="offset_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="3" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="210,32,39,255"/>
@@ -8545,32 +8547,32 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol is_animated="0" type="fill" name="@@0@1@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+                  <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@@0@1@0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="210,32,39,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="26,0,201,0" type="QString" name="outline_color"/>
-                        <Option value="no" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="210,32,39,255" name="color"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="26,0,201,0" name="outline_color"/>
+                        <Option type="QString" value="no" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="210,32,39,255"/>
@@ -8585,9 +8587,9 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -8595,35 +8597,35 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="flat" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="miter" type="QString" name="joinstyle"/>
-                <Option value="210,32,39,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.75" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="flat" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="miter" name="joinstyle"/>
+                <Option type="QString" value="210,32,39,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.75" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="flat"/>
@@ -8654,39 +8656,39 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" type="line" name="1" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="500" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="LastVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="500" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="LastVertex" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -8706,44 +8708,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="interval">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="offsetAlongLine">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" type="marker" name="@1@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+              <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@1@0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer locked="0" class="FilledMarker" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="103,34,144,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="3" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="103,34,144,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="filled_arrowhead" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="3" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="103,34,144,255"/>
@@ -8759,32 +8761,32 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol is_animated="0" type="fill" name="@@1@0@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+                  <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@@1@0@0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="103,34,144,255" type="QString" name="color"/>
-                        <Option value="miter" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="103,34,144,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0.5" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="103,34,144,255" name="color"/>
+                        <Option type="QString" value="miter" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="103,34,144,255" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0.5" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="103,34,144,255"/>
@@ -8799,9 +8801,9 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -8809,24 +8811,24 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="250" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="100" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="Interval" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="250" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="100" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="Interval" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -8846,44 +8848,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="interval">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="offsetAlongLine">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" type="marker" name="@1@1" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+              <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@1@1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer locked="0" class="FilledMarker" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="103,34,144,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="3" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="103,34,144,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="filled_arrowhead" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="3" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="103,34,144,255"/>
@@ -8899,32 +8901,32 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol is_animated="0" type="fill" name="@@1@1@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+                  <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@@1@1@0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="103,34,144,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="26,0,201,0" type="QString" name="outline_color"/>
-                        <Option value="no" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="103,34,144,255" name="color"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="26,0,201,0" name="outline_color"/>
+                        <Option type="QString" value="no" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="103,34,144,255"/>
@@ -8939,9 +8941,9 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -8949,35 +8951,35 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="flat" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="miter" type="QString" name="joinstyle"/>
-                <Option value="103,34,144,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.75" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="flat" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="miter" name="joinstyle"/>
+                <Option type="QString" value="103,34,144,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.75" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="flat"/>
@@ -9008,39 +9010,39 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" type="line" name="2" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="2">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="500" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="LastVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="500" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="LastVertex" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -9060,44 +9062,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="interval">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="offsetAlongLine">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" type="marker" name="@2@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+              <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@2@0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer locked="0" class="FilledMarker" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="69,100,25,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MapUnit" type="QString" name="offset_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="3" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="69,100,25,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="filled_arrowhead" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MapUnit" name="offset_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="3" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="69,100,25,255"/>
@@ -9113,32 +9115,32 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol is_animated="0" type="fill" name="@@2@0@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+                  <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@@2@0@0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="69,100,25,255" type="QString" name="color"/>
-                        <Option value="miter" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="69,100,25,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0.5" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="69,100,25,255" name="color"/>
+                        <Option type="QString" value="miter" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="69,100,25,255" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0.5" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="69,100,25,255"/>
@@ -9153,9 +9155,9 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -9163,24 +9165,24 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="250" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="100" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="Interval" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="250" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="100" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="Interval" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -9200,44 +9202,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="interval">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="offsetAlongLine">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" type="marker" name="@2@1" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+              <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@2@1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer locked="0" class="FilledMarker" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="69,100,25,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MapUnit" type="QString" name="offset_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="3" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="69,100,25,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="filled_arrowhead" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MapUnit" name="offset_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="3" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="69,100,25,255"/>
@@ -9253,32 +9255,32 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol is_animated="0" type="fill" name="@@2@1@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+                  <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@@2@1@0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="69,100,25,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="26,0,201,0" type="QString" name="outline_color"/>
-                        <Option value="no" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="69,100,25,255" name="color"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="26,0,201,0" name="outline_color"/>
+                        <Option type="QString" value="no" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="69,100,25,255"/>
@@ -9293,9 +9295,9 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -9303,35 +9305,35 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="flat" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="miter" type="QString" name="joinstyle"/>
-                <Option value="69,100,25,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.75" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="flat" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="miter" name="joinstyle"/>
+                <Option type="QString" value="69,100,25,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.75" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="flat"/>
@@ -9362,9 +9364,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -9376,11 +9378,11 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString" name="dualview/previewExpressions"/>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="QString" value="copy" name="QFieldSync/action"/>
+          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" name="dualview/previewExpressions"/>
+          <Option type="QString" value="0" name="embeddedWidgets/count"/>
           <Option type="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -9388,48 +9390,48 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory penAlpha="255" width="15" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" minimumSize="0" enabled="0" maxScaleDenominator="1e+08" diagramOrientation="Up" opacity="1" scaleBasedVisibility="0" spacingUnit="MM" minScaleDenominator="100000" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" lineSizeType="MM" penWidth="0" backgroundAlpha="255" scaleDependency="Area" spacing="0" direction="1" barWidth="5" sizeType="MM" height="15" penColor="#000000" showAxis="0">
-          <fontProperties bold="0" style="" italic="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0"/>
-          <attribute label="" colorOpacity="1" field="" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory height="15" scaleDependency="Area" width="15" lineSizeScale="3x:0,0,0,0,0,0" spacingUnit="MM" lineSizeType="MM" penColor="#000000" spacing="0" labelPlacementMethod="XHeight" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" backgroundAlpha="255" maxScaleDenominator="1e+08" barWidth="5" penWidth="0" minimumSize="0" penAlpha="255" minScaleDenominator="100000" sizeType="MM" backgroundColor="#ffffff" enabled="0" opacity="1" direction="1" scaleBasedVisibility="0" showAxis="0" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270">
+          <fontProperties style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0" strikethrough="0" italic="0" underline="0" bold="0"/>
+          <attribute color="#000000" field="" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="35,35,35,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0.26" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -9460,9 +9462,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -9470,20 +9472,20 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="2" showAll="1" placement="2" zIndex="0" dist="0" priority="0" obstacle="0">
+      <DiagramLayerSettings priority="0" linePlacementFlags="2" obstacle="0" dist="0" zIndex="0" placement="2" showAll="1">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field configurationFlags="None" name="id">
@@ -9497,38 +9499,38 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
-        <alias index="1" name="" field="Distance"/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="Distance" name=""/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="Distance"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="Distance" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="id" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="Distance" constraints="0"/>
+        <constraint exp_strength="0" field="id" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="Distance" notnull_strength="0" constraints="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" desc="" field="id"/>
-        <constraint exp="" desc="" field="Distance"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="Distance" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="&quot;Distance&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="&quot;Distance&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column width="-1" type="field" name="Distance" hidden="0"/>
+          <column width="-1" type="field" hidden="0" name="Distance"/>
           <column width="-1" type="actions" hidden="1"/>
-          <column width="-1" type="field" name="id" hidden="0"/>
+          <column width="-1" type="field" hidden="0" name="id"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -9560,30 +9562,30 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="Distance" editable="1"/>
-        <field name="Name" editable="1"/>
-        <field name="RouteLen" editable="1"/>
-        <field name="Source" editable="1"/>
-        <field name="begin" editable="1"/>
-        <field name="descriptio" editable="1"/>
-        <field name="end" editable="1"/>
-        <field name="id" editable="1"/>
-        <field name="length_km" editable="1"/>
-        <field name="length_m" editable="1"/>
-        <field name="timestamp" editable="1"/>
+        <field editable="1" name="Distance"/>
+        <field editable="1" name="Name"/>
+        <field editable="1" name="RouteLen"/>
+        <field editable="1" name="Source"/>
+        <field editable="1" name="begin"/>
+        <field editable="1" name="descriptio"/>
+        <field editable="1" name="end"/>
+        <field editable="1" name="id"/>
+        <field editable="1" name="length_km"/>
+        <field editable="1" name="length_m"/>
+        <field editable="1" name="timestamp"/>
       </editable>
       <labelOnTop>
-        <field name="Distance" labelOnTop="0"/>
-        <field name="Name" labelOnTop="0"/>
-        <field name="RouteLen" labelOnTop="0"/>
-        <field name="Source" labelOnTop="0"/>
-        <field name="begin" labelOnTop="0"/>
-        <field name="descriptio" labelOnTop="0"/>
-        <field name="end" labelOnTop="0"/>
-        <field name="id" labelOnTop="0"/>
-        <field name="length_km" labelOnTop="0"/>
-        <field name="length_m" labelOnTop="0"/>
-        <field name="timestamp" labelOnTop="0"/>
+        <field labelOnTop="0" name="Distance"/>
+        <field labelOnTop="0" name="Name"/>
+        <field labelOnTop="0" name="RouteLen"/>
+        <field labelOnTop="0" name="Source"/>
+        <field labelOnTop="0" name="begin"/>
+        <field labelOnTop="0" name="descriptio"/>
+        <field labelOnTop="0" name="end"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="length_km"/>
+        <field labelOnTop="0" name="length_m"/>
+        <field labelOnTop="0" name="timestamp"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -9591,7 +9593,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" simplifyLocal="1" autoRefreshTime="0" wkbType="Point" simplifyDrawingHints="0" type="vector" symbologyReferenceScale="-1" minScale="100000000" legendPlaceholderImage="" refreshOnNotifyEnabled="0" labelsEnabled="1" maxScale="100000" styleCategories="AllStyleCategories" simplifyAlgorithm="0" refreshOnNotifyMessage="" readOnly="0" geometry="Point" autoRefreshEnabled="0" simplifyDrawingTol="1">
+    <maplayer simplifyLocal="1" simplifyDrawingHints="0" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1" legendPlaceholderImage="" symbologyReferenceScale="-1" readOnly="0" refreshOnNotifyEnabled="0" minScale="100000000" maxScale="100000" type="vector" autoRefreshTime="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="1" styleCategories="AllStyleCategories" geometry="Point" autoRefreshEnabled="0" wkbType="Point">
       <extent>
         <xmin>18.38517016505928936</xmin>
         <ymin>-33.91987011678683217</ymin>
@@ -9664,58 +9666,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" startExpression="" mode="0" limitMode="0" endField="" fixedDuration="0" accumulate="0" durationUnit="min" startField="" endExpression="" enabled="0">
+      <temporal durationField="" fixedDuration="0" accumulate="0" endField="" startField="" enabled="0" startExpression="" endExpression="" durationUnit="min" mode="0" limitMode="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" zscale="1" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" binding="Centroid" type="IndividualFeatures" symbology="Line" extrusion="0" zoffset="0">
+      <elevation extrusionEnabled="0" symbology="Line" type="IndividualFeatures" zscale="1" clamping="Terrain" showMarkerSymbolInSurfacePlots="0" zoffset="0" extrusion="0" respectLayerSymbol="1" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="125,139,143,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="125,139,143,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -9746,36 +9748,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="125,139,143,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="89,99,102,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="125,139,143,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="89,99,102,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="125,139,143,255"/>
@@ -9790,44 +9792,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="125,139,143,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="89,99,102,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="125,139,143,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="diamond" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="89,99,102,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="3" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -9850,46 +9852,46 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" type="singleSymbol" symbollevels="0" referencescale="-1" enableorderby="0">
+      <renderer-v2 enableorderby="0" type="singleSymbol" symbollevels="0" referencescale="-1" forceraster="0">
         <symbols>
-          <symbol is_animated="0" type="marker" name="0" clip_to_extent="1" alpha="0.796078" force_rhr="0" frame_rate="10">
+          <symbol alpha="0.796078" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="227,0,185,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="circle" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="1" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="227,0,185,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="circle" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0,0,0,0" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="1" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -9912,15 +9914,15 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="size">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="if ('marshal plan' = attribute( $atlasfeature , 'type' ), 0, 2)" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="QString" value="if ('marshal plan' = attribute( $atlasfeature , 'type' ), 0, 2)" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -9931,34 +9933,34 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="rule-based">
         <rules key="{de1ff1b5-a53a-4841-835f-57785b684a9d}">
-          <rule filter="'marshal' = attribute( $atlasfeature , 'type' )" description="Show in marshal maps" key="{9ea624c1-7179-4746-8777-84b8008475a1}">
+          <rule description="Show in marshal maps" key="{9ea624c1-7179-4746-8777-84b8008475a1}" filter="'marshal' = attribute( $atlasfeature , 'type' )">
             <settings calloutType="simple">
-              <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="63" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="1" fieldName="position" useSubstitutions="0" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="8" namedStyle="Semibold" forcedItalic="0" isExpression="0" fontSizeUnit="Point" allowHtml="0" legendString="Aa">
+              <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="Semibold" fontUnderline="0" fieldName="position" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" useSubstitutions="0" fontWeight="63" fontStrikeout="0" fontItalic="0" fontSize="8" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" isExpression="0" legendString="Aa" textOrientation="horizontal">
                 <families/>
-                <text-buffer bufferNoFill="0" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="0"/>
-                <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0.20000000000000001" shapeFillColor="255,255,255,255" shapeDraw="1" shapeBorderWidth="0.40000000000000002" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0.20000000000000001" shapeType="3" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="0,0,0,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-                  <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+                <text-buffer bufferNoFill="0" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+                <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskType="0"/>
+                <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="0,0,0,255" shapeRotationType="0" shapeSizeX="0.20000000000000001" shapeDraw="1" shapeType="3" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0.40000000000000002" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0.20000000000000001" shapeRadiiX="0">
+                  <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="255,255,255,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0.4" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="255,255,255,255" name="color"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0.4" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="255,255,255,255"/>
@@ -9973,151 +9975,151 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option value="true" type="bool" name="active"/>
-                              <Option value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" type="QString" name="expression"/>
-                              <Option value="3" type="int" name="type"/>
+                              <Option type="bool" value="true" name="active"/>
+                              <Option type="QString" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" name="expression"/>
+                              <Option type="int" value="3" name="type"/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option type="Map" name="properties">
                       <Option type="Map" name="FontStyle">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" type="QString" name="expression"/>
-                        <Option value="3" type="int" name="type"/>
+                        <Option type="bool" value="false" name="active"/>
+                        <Option type="QString" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" name="expression"/>
+                        <Option type="int" value="3" name="type"/>
                       </Option>
                       <Option type="Map" name="ObstacleFactor">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="if ( $atlasfeatureid = $id, 10, 6 )" type="QString" name="expression"/>
-                        <Option value="3" type="int" name="type"/>
+                        <Option type="bool" value="true" name="active"/>
+                        <Option type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )" name="expression"/>
+                        <Option type="int" value="3" name="type"/>
                       </Option>
                       <Option type="Map" name="Priority">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="if ( $atlasfeatureid = $id, 10, 6 )" type="QString" name="expression"/>
-                        <Option value="3" type="int" name="type"/>
+                        <Option type="bool" value="true" name="active"/>
+                        <Option type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )" name="expression"/>
+                        <Option type="int" value="3" name="type"/>
                       </Option>
                       <Option type="Map" name="Size">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="if ( $atlasfeatureid = $id, 10, 8 )" type="QString" name="expression"/>
-                        <Option value="3" type="int" name="type"/>
+                        <Option type="bool" value="true" name="active"/>
+                        <Option type="QString" value="if ( $atlasfeatureid = $id, 10, 8 )" name="expression"/>
+                        <Option type="int" value="3" name="type"/>
                       </Option>
                       <Option type="Map" name="ZIndex">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="if ( $atlasfeatureid = $id, 10, 6 )" type="QString" name="expression"/>
-                        <Option value="3" type="int" name="type"/>
+                        <Option type="bool" value="true" name="active"/>
+                        <Option type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )" name="expression"/>
+                        <Option type="int" value="3" name="type"/>
                       </Option>
                     </Option>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format useMaxLineLengthForAutoWrap="1" leftDirectionSymbol="&lt;" wrapChar="" multilineAlign="0" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" decimals="3" rightDirectionSymbol=">" formatNumbers="0"/>
-              <placement overlapHandling="AllowOverlapIfRequired" lineAnchorType="0" centroidInside="0" overrunDistance="0" centroidWhole="0" geometryGeneratorEnabled="0" rotationAngle="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" geometryGeneratorType="PointGeometry" quadOffset="4" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="1" xOffset="0" allowDegraded="1" lineAnchorTextPoint="CenterOfText" layerType="UnknownGeometry" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" maxCurvedCharAngleOut="-20" repeatDistance="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" dist="0" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" distUnits="MM" lineAnchorClipping="0" placementFlags="10" priority="8" overrunDistanceUnit="MM" maxCurvedCharAngleIn="20" geometryGenerator="" lineAnchorPercent="0.5" yOffset="0" rotationUnit="AngleDegrees"/>
-              <rendering fontMaxPixelSize="10000" drawLabels="1" mergeLines="0" zIndex="0" upsidedownLabels="0" obstacleFactor="1" scaleVisibility="0" limitNumLabels="0" obstacleType="0" fontLimitPixelSize="0" maxNumLabels="2000" minFeatureSize="0" fontMinPixelSize="3" labelPerPart="0" obstacle="1" scaleMax="10000000" scaleMin="1" unplacedVisibility="0"/>
+              <text-format wrapChar="" rightDirectionSymbol=">" plussign="0" leftDirectionSymbol="&lt;" formatNumbers="0" decimals="3" multilineAlign="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
+              <placement offsetUnits="MapUnit" xOffset="0" maxCurvedCharAngleOut="-20" layerType="UnknownGeometry" allowDegraded="1" yOffset="0" overlapHandling="AllowOverlapIfRequired" geometryGeneratorType="PointGeometry" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" repeatDistanceUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" quadOffset="4" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidWhole="0" overrunDistance="0" overrunDistanceUnit="MM" centroidInside="0" placement="1" geometryGenerator="" priority="8" distUnits="MM" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" dist="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorTextPoint="CenterOfText" polygonPlacementFlags="2" rotationUnit="AngleDegrees" offsetType="0" placementFlags="10" repeatDistance="0"/>
+              <rendering limitNumLabels="0" obstacleType="0" obstacle="1" scaleMax="10000000" maxNumLabels="2000" labelPerPart="0" scaleMin="1" upsidedownLabels="0" zIndex="0" unplacedVisibility="0" fontLimitPixelSize="0" minFeatureSize="0" fontMaxPixelSize="10000" scaleVisibility="0" fontMinPixelSize="3" drawLabels="1" mergeLines="0" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="FontStyle">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="QString" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="ObstacleFactor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if ( $atlasfeatureid = $id, 10, 6 )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="Priority">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if ( $atlasfeatureid = $id, 10, 6 )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="ShapeFillColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="Size">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if ( $atlasfeatureid = $id, 10, 8 )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if ( $atlasfeatureid = $id, 10, 8 )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="ZIndex">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if ( $atlasfeatureid = $id, 10, 6 )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+                  <Option type="int" value="0" name="blendMode"/>
                   <Option type="Map" name="ddProperties">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
-                  <Option value="false" type="bool" name="drawToAllParts"/>
-                  <Option value="0" type="QString" name="enabled"/>
-                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                  <Option value="&lt;symbol is_animated=&quot;0&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                  <Option value="0" type="double" name="minLength"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                  <Option value="MM" type="QString" name="minLengthUnit"/>
-                  <Option value="0" type="double" name="offsetFromAnchor"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                  <Option value="0" type="double" name="offsetFromLabel"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                  <Option type="bool" value="false" name="drawToAllParts"/>
+                  <Option type="QString" value="0" name="enabled"/>
+                  <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
+                  <Option type="QString" value="&lt;symbol alpha=&quot;1&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
+                  <Option type="double" value="0" name="minLength"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
+                  <Option type="QString" value="MM" name="minLengthUnit"/>
+                  <Option type="double" value="0" name="offsetFromAnchor"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
+                  <Option type="double" value="0" name="offsetFromLabel"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule filter="'marshal plan' = attribute( $atlasfeature , 'type' )" description="Show in marshal overview" key="{df44d75f-ef99-453d-ab36-57ffc3b9d443}">
+          <rule description="Show in marshal overview" key="{df44d75f-ef99-453d-ab36-57ffc3b9d443}" filter="'marshal plan' = attribute( $atlasfeature , 'type' )">
             <settings calloutType="simple">
-              <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="63" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="227,0,185,255" textOpacity="0.90000000000000002" fieldName="position" useSubstitutions="0" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="4" namedStyle="Semibold" forcedItalic="0" isExpression="0" fontSizeUnit="Point" allowHtml="0" legendString="Aa">
+              <text-style textOpacity="0.90000000000000002" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="Semibold" fontUnderline="0" fieldName="position" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" useSubstitutions="0" fontWeight="63" fontStrikeout="0" fontItalic="0" fontSize="4" allowHtml="0" fontKerning="1" textColor="227,0,185,255" fontFamily="Myriad Pro" capitalization="0" isExpression="0" legendString="Aa" textOrientation="horizontal">
                 <families/>
-                <text-buffer bufferNoFill="0" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="0"/>
-                <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeDraw="1" shapeBorderWidth="0.10000000000000001" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0" shapeType="3" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="0,0,0,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="0.5" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-                  <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+                <text-buffer bufferNoFill="0" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+                <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskType="0"/>
+                <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="0,0,0,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="1" shapeType="3" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0.10000000000000001" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="0.5" shapeSizeY="0" shapeRadiiX="0">
+                  <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="255,255,255,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0.1" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="255,255,255,255" name="color"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0.1" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="255,255,255,255"/>
@@ -10132,89 +10134,89 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option value="false" type="bool" name="active"/>
-                              <Option value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" type="QString" name="expression"/>
-                              <Option value="3" type="int" name="type"/>
+                              <Option type="bool" value="false" name="active"/>
+                              <Option type="QString" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" name="expression"/>
+                              <Option type="int" value="3" name="type"/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option type="Map" name="properties">
                       <Option type="Map" name="FontStyle">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" type="QString" name="expression"/>
-                        <Option value="3" type="int" name="type"/>
+                        <Option type="bool" value="false" name="active"/>
+                        <Option type="QString" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" name="expression"/>
+                        <Option type="int" value="3" name="type"/>
                       </Option>
                       <Option type="Map" name="Size">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="if ( $atlasfeatureid = $id, 10, 8 )" type="QString" name="expression"/>
-                        <Option value="3" type="int" name="type"/>
+                        <Option type="bool" value="false" name="active"/>
+                        <Option type="QString" value="if ( $atlasfeatureid = $id, 10, 8 )" name="expression"/>
+                        <Option type="int" value="3" name="type"/>
                       </Option>
                     </Option>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format useMaxLineLengthForAutoWrap="1" leftDirectionSymbol="&lt;" wrapChar="" multilineAlign="0" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" decimals="3" rightDirectionSymbol=">" formatNumbers="0"/>
-              <placement overlapHandling="AllowOverlapIfRequired" lineAnchorType="0" centroidInside="0" overrunDistance="0" centroidWhole="0" geometryGeneratorEnabled="0" rotationAngle="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" geometryGeneratorType="PointGeometry" quadOffset="4" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="6" xOffset="0" allowDegraded="1" lineAnchorTextPoint="CenterOfText" layerType="UnknownGeometry" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" maxCurvedCharAngleOut="-20" repeatDistance="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" dist="1" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" distUnits="MM" lineAnchorClipping="0" placementFlags="10" priority="10" overrunDistanceUnit="MM" maxCurvedCharAngleIn="20" geometryGenerator="" lineAnchorPercent="0.5" yOffset="0" rotationUnit="AngleDegrees"/>
-              <rendering fontMaxPixelSize="10000" drawLabels="1" mergeLines="0" zIndex="2" upsidedownLabels="0" obstacleFactor="1" scaleVisibility="0" limitNumLabels="0" obstacleType="0" fontLimitPixelSize="0" maxNumLabels="2000" minFeatureSize="0" fontMinPixelSize="3" labelPerPart="0" obstacle="0" scaleMax="10000000" scaleMin="1" unplacedVisibility="0"/>
+              <text-format wrapChar="" rightDirectionSymbol=">" plussign="0" leftDirectionSymbol="&lt;" formatNumbers="0" decimals="3" multilineAlign="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
+              <placement offsetUnits="MapUnit" xOffset="0" maxCurvedCharAngleOut="-20" layerType="UnknownGeometry" allowDegraded="1" yOffset="0" overlapHandling="AllowOverlapIfRequired" geometryGeneratorType="PointGeometry" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" repeatDistanceUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" quadOffset="4" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidWhole="0" overrunDistance="0" overrunDistanceUnit="MM" centroidInside="0" placement="6" geometryGenerator="" priority="10" distUnits="MM" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" dist="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorTextPoint="CenterOfText" polygonPlacementFlags="2" rotationUnit="AngleDegrees" offsetType="0" placementFlags="10" repeatDistance="0"/>
+              <rendering limitNumLabels="0" obstacleType="0" obstacle="0" scaleMax="10000000" maxNumLabels="2000" labelPerPart="0" scaleMin="1" upsidedownLabels="0" zIndex="2" unplacedVisibility="0" fontLimitPixelSize="0" minFeatureSize="0" fontMaxPixelSize="10000" scaleVisibility="0" fontMinPixelSize="3" drawLabels="1" mergeLines="0" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="FontStyle">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="QString" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="ShapeFillColor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="QString" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="Size">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="if ( $atlasfeatureid = $id, 10, 8 )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="QString" value="if ( $atlasfeatureid = $id, 10, 8 )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+                  <Option type="int" value="0" name="blendMode"/>
                   <Option type="Map" name="ddProperties">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
-                  <Option value="false" type="bool" name="drawToAllParts"/>
-                  <Option value="0" type="QString" name="enabled"/>
-                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                  <Option value="&lt;symbol is_animated=&quot;0&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                  <Option value="0" type="double" name="minLength"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                  <Option value="MM" type="QString" name="minLengthUnit"/>
-                  <Option value="0" type="double" name="offsetFromAnchor"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                  <Option value="0" type="double" name="offsetFromLabel"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                  <Option type="bool" value="false" name="drawToAllParts"/>
+                  <Option type="QString" value="0" name="enabled"/>
+                  <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
+                  <Option type="QString" value="&lt;symbol alpha=&quot;1&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
+                  <Option type="double" value="0" name="minLength"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
+                  <Option type="QString" value="MM" name="minLengthUnit"/>
+                  <Option type="double" value="0" name="offsetFromAnchor"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
+                  <Option type="double" value="0" name="offsetFromLabel"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
@@ -10223,145 +10225,145 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
-          <Option value="false" type="QString" name="labeling/addDirectionSymbol"/>
-          <Option value="0" type="QString" name="labeling/angleOffset"/>
-          <Option value="0" type="QString" name="labeling/blendMode"/>
-          <Option value="0" type="QString" name="labeling/bufferBlendMode"/>
-          <Option value="255" type="QString" name="labeling/bufferColorA"/>
-          <Option value="255" type="QString" name="labeling/bufferColorB"/>
-          <Option value="255" type="QString" name="labeling/bufferColorG"/>
-          <Option value="255" type="QString" name="labeling/bufferColorR"/>
-          <Option value="false" type="QString" name="labeling/bufferDraw"/>
-          <Option value="64" type="QString" name="labeling/bufferJoinStyle"/>
-          <Option value="false" type="QString" name="labeling/bufferNoFill"/>
-          <Option value="1" type="QString" name="labeling/bufferSize"/>
-          <Option value="false" type="QString" name="labeling/bufferSizeInMapUnits"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/bufferSizeMapUnitScale"/>
-          <Option value="0" type="QString" name="labeling/bufferTransp"/>
-          <Option value="false" type="QString" name="labeling/centroidInside"/>
-          <Option value="false" type="QString" name="labeling/centroidWhole"/>
-          <Option value="3" type="QString" name="labeling/decimals"/>
-          <Option value="false" type="QString" name="labeling/displayAll"/>
-          <Option value="0" type="QString" name="labeling/dist"/>
-          <Option value="false" type="QString" name="labeling/distInMapUnits"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/distMapUnitScale"/>
-          <Option value="false" type="QString" name="labeling/drawLabels"/>
-          <Option value="false" type="QString" name="labeling/enabled"/>
-          <Option value="position" type="QString" name="labeling/fieldName"/>
-          <Option value="false" type="QString" name="labeling/fitInPolygonOnly"/>
-          <Option value="0" type="QString" name="labeling/fontCapitals"/>
-          <Option value="Myriad Pro" type="QString" name="labeling/fontFamily"/>
-          <Option value="false" type="QString" name="labeling/fontItalic"/>
-          <Option value="0" type="QString" name="labeling/fontLetterSpacing"/>
-          <Option value="false" type="QString" name="labeling/fontLimitPixelSize"/>
-          <Option value="10000" type="QString" name="labeling/fontMaxPixelSize"/>
-          <Option value="3" type="QString" name="labeling/fontMinPixelSize"/>
-          <Option value="10" type="QString" name="labeling/fontSize"/>
-          <Option value="false" type="QString" name="labeling/fontSizeInMapUnits"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/fontSizeMapUnitScale"/>
-          <Option value="false" type="QString" name="labeling/fontStrikeout"/>
-          <Option value="false" type="QString" name="labeling/fontUnderline"/>
-          <Option value="63" type="QString" name="labeling/fontWeight"/>
-          <Option value="0" type="QString" name="labeling/fontWordSpacing"/>
-          <Option value="false" type="QString" name="labeling/formatNumbers"/>
-          <Option value="false" type="QString" name="labeling/isExpression"/>
-          <Option value="true" type="QString" name="labeling/labelOffsetInMapUnits"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/labelOffsetMapUnitScale"/>
-          <Option value="false" type="QString" name="labeling/labelPerPart"/>
-          <Option value="&lt;" type="QString" name="labeling/leftDirectionSymbol"/>
-          <Option value="false" type="QString" name="labeling/limitNumLabels"/>
-          <Option value="20" type="QString" name="labeling/maxCurvedCharAngleIn"/>
-          <Option value="-20" type="QString" name="labeling/maxCurvedCharAngleOut"/>
-          <Option value="2000" type="QString" name="labeling/maxNumLabels"/>
-          <Option value="false" type="QString" name="labeling/mergeLines"/>
-          <Option value="0" type="QString" name="labeling/minFeatureSize"/>
-          <Option value="0" type="QString" name="labeling/multilineAlign"/>
-          <Option value="1" type="QString" name="labeling/multilineHeight"/>
-          <Option value="Semibold" type="QString" name="labeling/namedStyle"/>
-          <Option value="true" type="QString" name="labeling/obstacle"/>
-          <Option value="1" type="QString" name="labeling/obstacleFactor"/>
-          <Option value="0" type="QString" name="labeling/obstacleType"/>
-          <Option value="0" type="QString" name="labeling/offsetType"/>
-          <Option value="0" type="QString" name="labeling/placeDirectionSymbol"/>
-          <Option value="0" type="QString" name="labeling/placement"/>
-          <Option value="10" type="QString" name="labeling/placementFlags"/>
-          <Option value="false" type="QString" name="labeling/plussign"/>
-          <Option value="TR,TL,BR,BL,R,L,TSR,BSR" type="QString" name="labeling/predefinedPositionOrder"/>
-          <Option value="true" type="QString" name="labeling/preserveRotation"/>
-          <Option value="#ffffff" type="QString" name="labeling/previewBkgrdColor"/>
-          <Option value="5" type="QString" name="labeling/priority"/>
-          <Option value="4" type="QString" name="labeling/quadOffset"/>
-          <Option value="0" type="QString" name="labeling/repeatDistance"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/repeatDistanceMapUnitScale"/>
-          <Option value="1" type="QString" name="labeling/repeatDistanceUnit"/>
-          <Option value="false" type="QString" name="labeling/reverseDirectionSymbol"/>
-          <Option value=">" type="QString" name="labeling/rightDirectionSymbol"/>
-          <Option value="10000000" type="QString" name="labeling/scaleMax"/>
-          <Option value="1" type="QString" name="labeling/scaleMin"/>
-          <Option value="false" type="QString" name="labeling/scaleVisibility"/>
-          <Option value="6" type="QString" name="labeling/shadowBlendMode"/>
-          <Option value="0" type="QString" name="labeling/shadowColorB"/>
-          <Option value="0" type="QString" name="labeling/shadowColorG"/>
-          <Option value="0" type="QString" name="labeling/shadowColorR"/>
-          <Option value="false" type="QString" name="labeling/shadowDraw"/>
-          <Option value="135" type="QString" name="labeling/shadowOffsetAngle"/>
-          <Option value="1" type="QString" name="labeling/shadowOffsetDist"/>
-          <Option value="true" type="QString" name="labeling/shadowOffsetGlobal"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shadowOffsetMapUnitScale"/>
-          <Option value="1" type="QString" name="labeling/shadowOffsetUnits"/>
-          <Option value="1.5" type="QString" name="labeling/shadowRadius"/>
-          <Option value="false" type="QString" name="labeling/shadowRadiusAlphaOnly"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shadowRadiusMapUnitScale"/>
-          <Option value="1" type="QString" name="labeling/shadowRadiusUnits"/>
-          <Option value="100" type="QString" name="labeling/shadowScale"/>
-          <Option value="30" type="QString" name="labeling/shadowTransparency"/>
-          <Option value="0" type="QString" name="labeling/shadowUnder"/>
-          <Option value="0" type="QString" name="labeling/shapeBlendMode"/>
-          <Option value="255" type="QString" name="labeling/shapeBorderColorA"/>
-          <Option value="128" type="QString" name="labeling/shapeBorderColorB"/>
-          <Option value="128" type="QString" name="labeling/shapeBorderColorG"/>
-          <Option value="128" type="QString" name="labeling/shapeBorderColorR"/>
-          <Option value="0" type="QString" name="labeling/shapeBorderWidth"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shapeBorderWidthMapUnitScale"/>
-          <Option value="1" type="QString" name="labeling/shapeBorderWidthUnits"/>
-          <Option value="true" type="QString" name="labeling/shapeDraw"/>
-          <Option value="255" type="QString" name="labeling/shapeFillColorA"/>
-          <Option value="138" type="QString" name="labeling/shapeFillColorB"/>
-          <Option value="0" type="QString" name="labeling/shapeFillColorG"/>
-          <Option value="101" type="QString" name="labeling/shapeFillColorR"/>
-          <Option value="64" type="QString" name="labeling/shapeJoinStyle"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shapeOffsetMapUnitScale"/>
-          <Option value="1" type="QString" name="labeling/shapeOffsetUnits"/>
-          <Option value="0" type="QString" name="labeling/shapeOffsetX"/>
-          <Option value="0" type="QString" name="labeling/shapeOffsetY"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shapeRadiiMapUnitScale"/>
-          <Option value="1" type="QString" name="labeling/shapeRadiiUnits"/>
-          <Option value="0" type="QString" name="labeling/shapeRadiiX"/>
-          <Option value="0" type="QString" name="labeling/shapeRadiiY"/>
-          <Option value="0" type="QString" name="labeling/shapeRotation"/>
-          <Option value="0" type="QString" name="labeling/shapeRotationType"/>
-          <Option value="" type="QString" name="labeling/shapeSVGFile"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shapeSizeMapUnitScale"/>
-          <Option value="0" type="QString" name="labeling/shapeSizeType"/>
-          <Option value="1" type="QString" name="labeling/shapeSizeUnits"/>
-          <Option value="0" type="QString" name="labeling/shapeSizeX"/>
-          <Option value="0" type="QString" name="labeling/shapeSizeY"/>
-          <Option value="0" type="QString" name="labeling/shapeTransparency"/>
-          <Option value="0" type="QString" name="labeling/shapeType"/>
-          <Option value="255" type="QString" name="labeling/textColorA"/>
-          <Option value="255" type="QString" name="labeling/textColorB"/>
-          <Option value="255" type="QString" name="labeling/textColorG"/>
-          <Option value="255" type="QString" name="labeling/textColorR"/>
-          <Option value="0" type="QString" name="labeling/textTransp"/>
-          <Option value="0" type="QString" name="labeling/upsidedownLabels"/>
-          <Option value="" type="QString" name="labeling/wrapChar"/>
-          <Option value="0" type="QString" name="labeling/xOffset"/>
-          <Option value="0" type="QString" name="labeling/yOffset"/>
-          <Option value="0" type="QString" name="labeling/zIndex"/>
+          <Option type="QString" value="copy" name="QFieldSync/action"/>
+          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="0" name="embeddedWidgets/count"/>
+          <Option type="QString" value="false" name="labeling/addDirectionSymbol"/>
+          <Option type="QString" value="0" name="labeling/angleOffset"/>
+          <Option type="QString" value="0" name="labeling/blendMode"/>
+          <Option type="QString" value="0" name="labeling/bufferBlendMode"/>
+          <Option type="QString" value="255" name="labeling/bufferColorA"/>
+          <Option type="QString" value="255" name="labeling/bufferColorB"/>
+          <Option type="QString" value="255" name="labeling/bufferColorG"/>
+          <Option type="QString" value="255" name="labeling/bufferColorR"/>
+          <Option type="QString" value="false" name="labeling/bufferDraw"/>
+          <Option type="QString" value="64" name="labeling/bufferJoinStyle"/>
+          <Option type="QString" value="false" name="labeling/bufferNoFill"/>
+          <Option type="QString" value="1" name="labeling/bufferSize"/>
+          <Option type="QString" value="false" name="labeling/bufferSizeInMapUnits"/>
+          <Option type="QString" value="0,0,0,0,0,0" name="labeling/bufferSizeMapUnitScale"/>
+          <Option type="QString" value="0" name="labeling/bufferTransp"/>
+          <Option type="QString" value="false" name="labeling/centroidInside"/>
+          <Option type="QString" value="false" name="labeling/centroidWhole"/>
+          <Option type="QString" value="3" name="labeling/decimals"/>
+          <Option type="QString" value="false" name="labeling/displayAll"/>
+          <Option type="QString" value="0" name="labeling/dist"/>
+          <Option type="QString" value="false" name="labeling/distInMapUnits"/>
+          <Option type="QString" value="0,0,0,0,0,0" name="labeling/distMapUnitScale"/>
+          <Option type="QString" value="false" name="labeling/drawLabels"/>
+          <Option type="QString" value="false" name="labeling/enabled"/>
+          <Option type="QString" value="position" name="labeling/fieldName"/>
+          <Option type="QString" value="false" name="labeling/fitInPolygonOnly"/>
+          <Option type="QString" value="0" name="labeling/fontCapitals"/>
+          <Option type="QString" value="Myriad Pro" name="labeling/fontFamily"/>
+          <Option type="QString" value="false" name="labeling/fontItalic"/>
+          <Option type="QString" value="0" name="labeling/fontLetterSpacing"/>
+          <Option type="QString" value="false" name="labeling/fontLimitPixelSize"/>
+          <Option type="QString" value="10000" name="labeling/fontMaxPixelSize"/>
+          <Option type="QString" value="3" name="labeling/fontMinPixelSize"/>
+          <Option type="QString" value="10" name="labeling/fontSize"/>
+          <Option type="QString" value="false" name="labeling/fontSizeInMapUnits"/>
+          <Option type="QString" value="0,0,0,0,0,0" name="labeling/fontSizeMapUnitScale"/>
+          <Option type="QString" value="false" name="labeling/fontStrikeout"/>
+          <Option type="QString" value="false" name="labeling/fontUnderline"/>
+          <Option type="QString" value="63" name="labeling/fontWeight"/>
+          <Option type="QString" value="0" name="labeling/fontWordSpacing"/>
+          <Option type="QString" value="false" name="labeling/formatNumbers"/>
+          <Option type="QString" value="false" name="labeling/isExpression"/>
+          <Option type="QString" value="true" name="labeling/labelOffsetInMapUnits"/>
+          <Option type="QString" value="0,0,0,0,0,0" name="labeling/labelOffsetMapUnitScale"/>
+          <Option type="QString" value="false" name="labeling/labelPerPart"/>
+          <Option type="QString" value="&lt;" name="labeling/leftDirectionSymbol"/>
+          <Option type="QString" value="false" name="labeling/limitNumLabels"/>
+          <Option type="QString" value="20" name="labeling/maxCurvedCharAngleIn"/>
+          <Option type="QString" value="-20" name="labeling/maxCurvedCharAngleOut"/>
+          <Option type="QString" value="2000" name="labeling/maxNumLabels"/>
+          <Option type="QString" value="false" name="labeling/mergeLines"/>
+          <Option type="QString" value="0" name="labeling/minFeatureSize"/>
+          <Option type="QString" value="0" name="labeling/multilineAlign"/>
+          <Option type="QString" value="1" name="labeling/multilineHeight"/>
+          <Option type="QString" value="Semibold" name="labeling/namedStyle"/>
+          <Option type="QString" value="true" name="labeling/obstacle"/>
+          <Option type="QString" value="1" name="labeling/obstacleFactor"/>
+          <Option type="QString" value="0" name="labeling/obstacleType"/>
+          <Option type="QString" value="0" name="labeling/offsetType"/>
+          <Option type="QString" value="0" name="labeling/placeDirectionSymbol"/>
+          <Option type="QString" value="0" name="labeling/placement"/>
+          <Option type="QString" value="10" name="labeling/placementFlags"/>
+          <Option type="QString" value="false" name="labeling/plussign"/>
+          <Option type="QString" value="TR,TL,BR,BL,R,L,TSR,BSR" name="labeling/predefinedPositionOrder"/>
+          <Option type="QString" value="true" name="labeling/preserveRotation"/>
+          <Option type="QString" value="#ffffff" name="labeling/previewBkgrdColor"/>
+          <Option type="QString" value="5" name="labeling/priority"/>
+          <Option type="QString" value="4" name="labeling/quadOffset"/>
+          <Option type="QString" value="0" name="labeling/repeatDistance"/>
+          <Option type="QString" value="0,0,0,0,0,0" name="labeling/repeatDistanceMapUnitScale"/>
+          <Option type="QString" value="1" name="labeling/repeatDistanceUnit"/>
+          <Option type="QString" value="false" name="labeling/reverseDirectionSymbol"/>
+          <Option type="QString" value=">" name="labeling/rightDirectionSymbol"/>
+          <Option type="QString" value="10000000" name="labeling/scaleMax"/>
+          <Option type="QString" value="1" name="labeling/scaleMin"/>
+          <Option type="QString" value="false" name="labeling/scaleVisibility"/>
+          <Option type="QString" value="6" name="labeling/shadowBlendMode"/>
+          <Option type="QString" value="0" name="labeling/shadowColorB"/>
+          <Option type="QString" value="0" name="labeling/shadowColorG"/>
+          <Option type="QString" value="0" name="labeling/shadowColorR"/>
+          <Option type="QString" value="false" name="labeling/shadowDraw"/>
+          <Option type="QString" value="135" name="labeling/shadowOffsetAngle"/>
+          <Option type="QString" value="1" name="labeling/shadowOffsetDist"/>
+          <Option type="QString" value="true" name="labeling/shadowOffsetGlobal"/>
+          <Option type="QString" value="0,0,0,0,0,0" name="labeling/shadowOffsetMapUnitScale"/>
+          <Option type="QString" value="1" name="labeling/shadowOffsetUnits"/>
+          <Option type="QString" value="1.5" name="labeling/shadowRadius"/>
+          <Option type="QString" value="false" name="labeling/shadowRadiusAlphaOnly"/>
+          <Option type="QString" value="0,0,0,0,0,0" name="labeling/shadowRadiusMapUnitScale"/>
+          <Option type="QString" value="1" name="labeling/shadowRadiusUnits"/>
+          <Option type="QString" value="100" name="labeling/shadowScale"/>
+          <Option type="QString" value="30" name="labeling/shadowTransparency"/>
+          <Option type="QString" value="0" name="labeling/shadowUnder"/>
+          <Option type="QString" value="0" name="labeling/shapeBlendMode"/>
+          <Option type="QString" value="255" name="labeling/shapeBorderColorA"/>
+          <Option type="QString" value="128" name="labeling/shapeBorderColorB"/>
+          <Option type="QString" value="128" name="labeling/shapeBorderColorG"/>
+          <Option type="QString" value="128" name="labeling/shapeBorderColorR"/>
+          <Option type="QString" value="0" name="labeling/shapeBorderWidth"/>
+          <Option type="QString" value="0,0,0,0,0,0" name="labeling/shapeBorderWidthMapUnitScale"/>
+          <Option type="QString" value="1" name="labeling/shapeBorderWidthUnits"/>
+          <Option type="QString" value="true" name="labeling/shapeDraw"/>
+          <Option type="QString" value="255" name="labeling/shapeFillColorA"/>
+          <Option type="QString" value="138" name="labeling/shapeFillColorB"/>
+          <Option type="QString" value="0" name="labeling/shapeFillColorG"/>
+          <Option type="QString" value="101" name="labeling/shapeFillColorR"/>
+          <Option type="QString" value="64" name="labeling/shapeJoinStyle"/>
+          <Option type="QString" value="0,0,0,0,0,0" name="labeling/shapeOffsetMapUnitScale"/>
+          <Option type="QString" value="1" name="labeling/shapeOffsetUnits"/>
+          <Option type="QString" value="0" name="labeling/shapeOffsetX"/>
+          <Option type="QString" value="0" name="labeling/shapeOffsetY"/>
+          <Option type="QString" value="0,0,0,0,0,0" name="labeling/shapeRadiiMapUnitScale"/>
+          <Option type="QString" value="1" name="labeling/shapeRadiiUnits"/>
+          <Option type="QString" value="0" name="labeling/shapeRadiiX"/>
+          <Option type="QString" value="0" name="labeling/shapeRadiiY"/>
+          <Option type="QString" value="0" name="labeling/shapeRotation"/>
+          <Option type="QString" value="0" name="labeling/shapeRotationType"/>
+          <Option type="QString" value="" name="labeling/shapeSVGFile"/>
+          <Option type="QString" value="0,0,0,0,0,0" name="labeling/shapeSizeMapUnitScale"/>
+          <Option type="QString" value="0" name="labeling/shapeSizeType"/>
+          <Option type="QString" value="1" name="labeling/shapeSizeUnits"/>
+          <Option type="QString" value="0" name="labeling/shapeSizeX"/>
+          <Option type="QString" value="0" name="labeling/shapeSizeY"/>
+          <Option type="QString" value="0" name="labeling/shapeTransparency"/>
+          <Option type="QString" value="0" name="labeling/shapeType"/>
+          <Option type="QString" value="255" name="labeling/textColorA"/>
+          <Option type="QString" value="255" name="labeling/textColorB"/>
+          <Option type="QString" value="255" name="labeling/textColorG"/>
+          <Option type="QString" value="255" name="labeling/textColorR"/>
+          <Option type="QString" value="0" name="labeling/textTransp"/>
+          <Option type="QString" value="0" name="labeling/upsidedownLabels"/>
+          <Option type="QString" value="" name="labeling/wrapChar"/>
+          <Option type="QString" value="0" name="labeling/xOffset"/>
+          <Option type="QString" value="0" name="labeling/yOffset"/>
+          <Option type="QString" value="0" name="labeling/zIndex"/>
           <Option type="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -10369,48 +10371,48 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory penAlpha="255" width="15" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" minimumSize="0" enabled="0" maxScaleDenominator="1e+08" diagramOrientation="Up" opacity="1" scaleBasedVisibility="0" spacingUnit="MM" minScaleDenominator="100000" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" lineSizeType="MM" penWidth="0" backgroundAlpha="255" scaleDependency="Area" spacing="0" direction="1" barWidth="5" sizeType="MM" height="15" penColor="#000000" showAxis="0">
-          <fontProperties bold="0" style="" italic="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0"/>
-          <attribute label="" colorOpacity="1" field="" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory height="15" scaleDependency="Area" width="15" lineSizeScale="3x:0,0,0,0,0,0" spacingUnit="MM" lineSizeType="MM" penColor="#000000" spacing="0" labelPlacementMethod="XHeight" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" backgroundAlpha="255" maxScaleDenominator="1e+08" barWidth="5" penWidth="0" minimumSize="0" penAlpha="255" minScaleDenominator="100000" sizeType="MM" backgroundColor="#ffffff" enabled="0" opacity="1" direction="1" scaleBasedVisibility="0" showAxis="0" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270">
+          <fontProperties style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0" strikethrough="0" italic="0" underline="0" bold="0"/>
+          <attribute color="#000000" field="" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="35,35,35,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0.26" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -10441,9 +10443,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -10451,28 +10453,28 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="10" showAll="1" placement="0" zIndex="0" dist="0" priority="0" obstacle="0">
+      <DiagramLayerSettings priority="0" linePlacementFlags="10" obstacle="0" dist="0" zIndex="0" placement="0" showAll="1">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field configurationFlags="None" name="id">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -10481,8 +10483,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -10491,43 +10493,43 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
-        <alias index="1" name="" field="position"/>
-        <alias index="2" name="" field="type"/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="position" name=""/>
+        <alias index="2" field="type" name=""/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="position"/>
-        <default applyOnUpdate="0" expression="" field="type"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="position" expression=""/>
+        <default applyOnUpdate="0" field="type" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="id" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="position" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="type" constraints="0"/>
+        <constraint exp_strength="0" field="id" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="position" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="type" notnull_strength="0" constraints="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" desc="" field="id"/>
-        <constraint exp="" desc="" field="position"/>
-        <constraint exp="" desc="" field="type"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="position" desc=""/>
+        <constraint exp="" field="type" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="&quot;position&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="&quot;position&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column width="-1" type="field" name="id" hidden="0"/>
+          <column width="-1" type="field" hidden="0" name="id"/>
           <column width="-1" type="actions" hidden="1"/>
-          <column width="-1" type="field" name="position" hidden="0"/>
-          <column width="-1" type="field" name="type" hidden="0"/>
+          <column width="-1" type="field" hidden="0" name="position"/>
+          <column width="-1" type="field" hidden="0" name="type"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -10603,7 +10605,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip>name</mapTip>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" simplifyLocal="1" autoRefreshTime="0" wkbType="Polygon" simplifyDrawingHints="1" type="vector" symbologyReferenceScale="-1" minScale="100000000" legendPlaceholderImage="" refreshOnNotifyEnabled="0" labelsEnabled="0" maxScale="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" refreshOnNotifyMessage="" readOnly="0" geometry="Polygon" autoRefreshEnabled="0" simplifyDrawingTol="1">
+    <maplayer simplifyLocal="1" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1" legendPlaceholderImage="" symbologyReferenceScale="-1" readOnly="0" refreshOnNotifyEnabled="0" minScale="100000000" maxScale="0" type="vector" autoRefreshTime="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="0" styleCategories="AllStyleCategories" geometry="Polygon" autoRefreshEnabled="0" wkbType="Polygon">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
@@ -10678,58 +10680,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" startExpression="" mode="0" limitMode="0" endField="" fixedDuration="0" accumulate="0" durationUnit="min" startField="" endExpression="" enabled="0">
+      <temporal durationField="" fixedDuration="0" accumulate="0" endField="" startField="" enabled="0" startExpression="" endExpression="" durationUnit="min" mode="0" limitMode="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" zscale="1" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" binding="Centroid" type="IndividualFeatures" symbology="Line" extrusion="0" zoffset="0">
+      <elevation extrusionEnabled="0" symbology="Line" type="IndividualFeatures" zscale="1" clamping="Terrain" showMarkerSymbolInSurfacePlots="0" zoffset="0" extrusion="0" respectLayerSymbol="1" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="164,113,88,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="164,113,88,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -10760,36 +10762,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="164,113,88,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="117,81,63,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="164,113,88,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="117,81,63,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="164,113,88,255"/>
@@ -10804,44 +10806,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="164,113,88,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="117,81,63,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="164,113,88,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="diamond" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="117,81,63,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="3" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -10864,38 +10866,38 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" type="singleSymbol" symbollevels="0" referencescale="-1" enableorderby="0">
+      <renderer-v2 enableorderby="0" type="singleSymbol" symbollevels="0" referencescale="-1" forceraster="0">
         <symbols>
-          <symbol is_animated="0" type="fill" name="0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="0,85,0,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0,85,0,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="b_diagonal" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="0,85,0,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0,85,0,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.26" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="b_diagonal" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="0,85,0,255"/>
@@ -10910,9 +10912,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="b_diagonal"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -10923,11 +10925,11 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="no_action" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option value="name" type="QString" name="dualview/previewExpressions"/>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="QString" value="no_action" name="QFieldSync/action"/>
+          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="name" name="dualview/previewExpressions"/>
+          <Option type="QString" value="0" name="embeddedWidgets/count"/>
           <Option type="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -10935,48 +10937,48 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory penAlpha="255" width="15" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" minimumSize="0" enabled="0" maxScaleDenominator="1e+08" diagramOrientation="Up" opacity="1" scaleBasedVisibility="0" spacingUnit="MM" minScaleDenominator="0" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" lineSizeType="MM" penWidth="0" backgroundAlpha="255" scaleDependency="Area" spacing="0" direction="1" barWidth="5" sizeType="MM" height="15" penColor="#000000" showAxis="0">
-          <fontProperties bold="0" style="" italic="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0"/>
-          <attribute label="" colorOpacity="1" field="" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory height="15" scaleDependency="Area" width="15" lineSizeScale="3x:0,0,0,0,0,0" spacingUnit="MM" lineSizeType="MM" penColor="#000000" spacing="0" labelPlacementMethod="XHeight" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" backgroundAlpha="255" maxScaleDenominator="1e+08" barWidth="5" penWidth="0" minimumSize="0" penAlpha="255" minScaleDenominator="0" sizeType="MM" backgroundColor="#ffffff" enabled="0" opacity="1" direction="1" scaleBasedVisibility="0" showAxis="0" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270">
+          <fontProperties style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0" strikethrough="0" italic="0" underline="0" bold="0"/>
+          <attribute color="#000000" field="" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="35,35,35,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0.26" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -11007,9 +11009,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -11017,20 +11019,20 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" showAll="1" placement="1" zIndex="0" dist="0" priority="0" obstacle="0">
+      <DiagramLayerSettings priority="0" linePlacementFlags="18" obstacle="0" dist="0" zIndex="0" placement="1" showAll="1">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field configurationFlags="None" name="name">
@@ -11070,45 +11072,45 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="name"/>
-        <alias index="1" name="" field="group"/>
-        <alias index="2" name="" field="type"/>
-        <alias index="3" name="" field="cone_len"/>
-        <alias index="4" name="" field="fence_len"/>
+        <alias index="0" field="name" name=""/>
+        <alias index="1" field="group" name=""/>
+        <alias index="2" field="type" name=""/>
+        <alias index="3" field="cone_len" name=""/>
+        <alias index="4" field="fence_len" name=""/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="name"/>
-        <default applyOnUpdate="0" expression="" field="group"/>
-        <default applyOnUpdate="0" expression="" field="type"/>
-        <default applyOnUpdate="0" expression="" field="cone_len"/>
-        <default applyOnUpdate="0" expression="" field="fence_len"/>
+        <default applyOnUpdate="0" field="name" expression=""/>
+        <default applyOnUpdate="0" field="group" expression=""/>
+        <default applyOnUpdate="0" field="type" expression=""/>
+        <default applyOnUpdate="0" field="cone_len" expression=""/>
+        <default applyOnUpdate="0" field="fence_len" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="name" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="group" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="type" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="cone_len" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="fence_len" constraints="0"/>
+        <constraint exp_strength="0" field="name" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="group" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="type" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="cone_len" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="fence_len" notnull_strength="0" constraints="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" desc="" field="name"/>
-        <constraint exp="" desc="" field="group"/>
-        <constraint exp="" desc="" field="type"/>
-        <constraint exp="" desc="" field="cone_len"/>
-        <constraint exp="" desc="" field="fence_len"/>
+        <constraint exp="" field="name" desc=""/>
+        <constraint exp="" field="group" desc=""/>
+        <constraint exp="" field="type" desc=""/>
+        <constraint exp="" field="cone_len" desc=""/>
+        <constraint exp="" field="fence_len" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column width="-1" type="field" name="name" hidden="0"/>
-          <column width="-1" type="field" name="group" hidden="0"/>
+          <column width="-1" type="field" hidden="0" name="name"/>
+          <column width="-1" type="field" hidden="0" name="group"/>
           <column width="-1" type="actions" hidden="1"/>
-          <column width="-1" type="field" name="type" hidden="0"/>
-          <column width="-1" type="field" name="cone_len" hidden="0"/>
-          <column width="-1" type="field" name="fence_len" hidden="0"/>
+          <column width="-1" type="field" hidden="0" name="type"/>
+          <column width="-1" type="field" hidden="0" name="cone_len"/>
+          <column width="-1" type="field" hidden="0" name="fence_len"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -11140,12 +11142,12 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="group" editable="1"/>
-        <field name="name" editable="1"/>
+        <field editable="1" name="group"/>
+        <field editable="1" name="name"/>
       </editable>
       <labelOnTop>
-        <field name="group" labelOnTop="0"/>
-        <field name="name" labelOnTop="0"/>
+        <field labelOnTop="0" name="group"/>
+        <field labelOnTop="0" name="name"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -11153,7 +11155,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" simplifyLocal="1" autoRefreshTime="0" wkbType="MultiLineString" simplifyDrawingHints="1" type="vector" symbologyReferenceScale="-1" minScale="100000000" legendPlaceholderImage="" refreshOnNotifyEnabled="0" labelsEnabled="1" maxScale="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" refreshOnNotifyMessage="" readOnly="0" geometry="Line" autoRefreshEnabled="0" simplifyDrawingTol="1">
+    <maplayer simplifyLocal="1" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1" legendPlaceholderImage="" symbologyReferenceScale="-1" readOnly="0" refreshOnNotifyEnabled="0" minScale="100000000" maxScale="0" type="vector" autoRefreshTime="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="1" styleCategories="AllStyleCategories" geometry="Line" autoRefreshEnabled="0" wkbType="MultiLineString">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
@@ -11218,7 +11220,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxy="0" minz="0" dimensions="2" maxx="0" maxz="0" miny="0" minx="0" crs=""/>
+          <spatial maxz="0" minx="0" maxx="0" minz="0" crs="" miny="0" maxy="0" dimensions="2"/>
           <temporal>
             <period>
               <start></start>
@@ -11232,26 +11234,26 @@ def my_form_open(dialog, layer, feature):
       <layerDependencies/>
       <dataDependencies/>
       <expressionfields>
-        <field typeName="double precision" subType="0" type="6" name="fence_len" precision="0" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" length="-1" comment=""/>
-        <field typeName="double precision" subType="0" type="6" name="fence_len" precision="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" length="-1" comment=""/>
-        <field typeName="double precision" subType="0" type="6" name="cone_len" precision="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" length="-1" comment=""/>
+        <field precision="0" comment="" type="6" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" length="-1" subType="0" typeName="double precision" name="fence_len"/>
+        <field precision="0" comment="" type="6" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" length="-1" subType="0" typeName="double precision" name="fence_len"/>
+        <field precision="0" comment="" type="6" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" length="-1" subType="0" typeName="double precision" name="cone_len"/>
       </expressionfields>
       <map-layer-style-manager current="Fencing">
         <map-layer-style name="Fencing"/>
         <map-layer-style name="Simple">
-          <qgis minScale="1e+08" simplifyMaxScale="1" version="3.8.3-Zanzibar" labelsEnabled="1" simplifyDrawingTol="1" maxScale="0" hasScaleBasedVisibilityFlag="0" simplifyAlgorithm="0" simplifyLocal="1" styleCategories="AllStyleCategories" readOnly="0" simplifyDrawingHints="1">
+          <qgis minScale="1e+08" labelsEnabled="1" hasScaleBasedVisibilityFlag="0" maxScale="0" readOnly="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" simplifyMaxScale="1" version="3.8.3-Zanzibar" simplifyLocal="1" simplifyDrawingHints="1" simplifyDrawingTol="1">
             <flags>
               <Identifiable>1</Identifiable>
               <Removable>1</Removable>
               <Searchable>1</Searchable>
             </flags>
-            <renderer-v2 forceraster="0" type="RuleRenderer" symbollevels="1" enableorderby="0">
+            <renderer-v2 enableorderby="0" type="RuleRenderer" symbollevels="1" forceraster="0">
               <rules key="{1747eeb3-5193-4fd1-bb47-6984c7977e45}">
-                <rule filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" symbol="0" label="Visible" key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}"/>
+                <rule symbol="0" label="Visible" key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL"/>
               </rules>
               <symbols>
-                <symbol type="line" name="0" clip_to_extent="1" alpha="1" force_rhr="0">
-                  <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+                <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" name="0">
+                  <layer locked="0" class="SimpleLine" enabled="1" pass="0">
                     <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"/>
@@ -11270,9 +11272,9 @@ def my_form_open(dialog, layer, feature):
                     <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
@@ -11281,64 +11283,64 @@ def my_form_open(dialog, layer, feature):
             </renderer-v2>
             <labeling type="rule-based">
               <rules key="{7b0a59ec-9387-4d8e-badd-0d99ebc42174}">
-                <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;" key="{4961744d-6387-45d0-90bf-01e48d575e6e}">
+                <rule key="{4961744d-6387-45d0-90bf-01e48d575e6e}" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;">
                   <settings>
-                    <text-style fontFamily="Myriad Pro" fontWeight="50" previewBkgrdColor="#ffffff" fontCapitals="0" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="0.8" fieldName="comment" useSubstitutions="0" fontStrikeout="0" blendMode="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" fontItalic="0" multilineHeight="1" fontSize="11" namedStyle="Regular" isExpression="0" fontSizeUnit="Point">
-                      <text-buffer bufferNoFill="1" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                      <background shapeRadiiY="1" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="1" shapeFillColor="255,255,255,255" shapeDraw="1" shapeBorderWidth="0.6" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="1" shapeType="0" shapeJoinStyle="128" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="255,255,0,255" shapeOffsetX="0" shapeOpacity="0.6" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeRadiiX="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0"/>
-                      <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.7" shadowOffsetGlobal="1" shadowScale="100" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+                    <text-style textOpacity="0.8" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" namedStyle="Regular" fontUnderline="0" fieldName="comment" multilineHeight="1" fontCapitals="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="#ffffff" fontWordSpacing="0" useSubstitutions="0" fontWeight="50" fontStrikeout="0" fontItalic="0" fontSize="11" textColor="0,0,0,255" fontFamily="Myriad Pro" isExpression="0">
+                      <text-buffer bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                      <background shapeRadiiY="1" shapeOffsetY="0" shapeSVGFile="" shapeBorderColor="255,255,0,255" shapeRotation="0" shapeRotationType="0" shapeSizeX="1" shapeDraw="1" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeJoinStyle="128" shapeOffsetX="0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0.6" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="0.6" shapeSizeY="1" shapeRadiiX="1"/>
+                      <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusUnit="MM" shadowUnder="0" shadowScale="100" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
                       <substitutions/>
                     </text-style>
-                    <text-format useMaxLineLengthForAutoWrap="1" leftDirectionSymbol="&lt;" wrapChar="" multilineAlign="4294967295" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" decimals="3" rightDirectionSymbol=">" formatNumbers="0"/>
-                    <placement rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="4" priority="5" centroidInside="0" xOffset="0" offsetType="0" yOffset="0" dist="5" distUnits="MM" offsetUnits="MM" quadOffset="4" maxCurvedCharAngleIn="25" placementFlags="2" maxCurvedCharAngleOut="-25" centroidWhole="0" preserveRotation="1" geometryGenerator="" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" distMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" repeatDistance="0" repeatDistanceUnits="MM" fitInPolygonOnly="0"/>
-                    <rendering fontMaxPixelSize="10000" drawLabels="1" mergeLines="1" zIndex="0" upsidedownLabels="0" displayAll="1" obstacleFactor="1" scaleVisibility="0" limitNumLabels="0" obstacleType="0" fontLimitPixelSize="0" maxNumLabels="2000" minFeatureSize="0" fontMinPixelSize="3" labelPerPart="0" obstacle="1" scaleMax="0" scaleMin="0"/>
+                    <text-format wrapChar="" plussign="0" rightDirectionSymbol=">" leftDirectionSymbol="&lt;" formatNumbers="0" decimals="3" multilineAlign="4294967295" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" reverseDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0"/>
+                    <placement quadOffset="4" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" priority="5" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" dist="5" offsetUnits="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" preserveRotation="1" yOffset="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" geometryGenerator="" centroidWhole="0" xOffset="0" placement="4" centroidInside="0" offsetType="0" placementFlags="2" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" maxCurvedCharAngleIn="25" maxCurvedCharAngleOut="-25" distUnits="MM"/>
+                    <rendering limitNumLabels="0" obstacleType="0" obstacle="1" scaleMax="0" maxNumLabels="2000" labelPerPart="0" scaleMin="0" upsidedownLabels="0" zIndex="0" fontLimitPixelSize="0" displayAll="1" minFeatureSize="0" fontMaxPixelSize="10000" scaleVisibility="0" fontMinPixelSize="3" drawLabels="1" mergeLines="1" obstacleFactor="1"/>
                     <dd_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option type="Map" name="properties">
                           <Option type="Map" name="PositionX">
-                            <Option value="true" type="bool" name="active"/>
-                            <Option value="auxiliary_storage_labeling_positionx" type="QString" name="field"/>
-                            <Option value="2" type="int" name="type"/>
+                            <Option type="bool" value="true" name="active"/>
+                            <Option type="QString" value="auxiliary_storage_labeling_positionx" name="field"/>
+                            <Option type="int" value="2" name="type"/>
                           </Option>
                           <Option type="Map" name="PositionY">
-                            <Option value="true" type="bool" name="active"/>
-                            <Option value="auxiliary_storage_labeling_positiony" type="QString" name="field"/>
-                            <Option value="2" type="int" name="type"/>
+                            <Option type="bool" value="true" name="active"/>
+                            <Option type="QString" value="auxiliary_storage_labeling_positiony" name="field"/>
+                            <Option type="int" value="2" name="type"/>
                           </Option>
                         </Option>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </dd_properties>
                   </settings>
                 </rule>
-                <rule filter="regexp_match(&quot;type&quot;, '^(fenc|cone)')" key="{b0a0c7d3-1b58-4c75-96e0-99907a348e50}">
+                <rule key="{b0a0c7d3-1b58-4c75-96e0-99907a348e50}" filter="regexp_match(&quot;type&quot;, '^(fenc|cone)')">
                   <settings>
-                    <text-style fontFamily="Myriad Pro" fontWeight="63" previewBkgrdColor="#ffffff" fontCapitals="0" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="1" fieldName="round( $length, 1) || 'm'" useSubstitutions="0" fontStrikeout="0" blendMode="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" fontItalic="0" multilineHeight="1" fontSize="12" namedStyle="Semibold" isExpression="1" fontSizeUnit="Point">
-                      <text-buffer bufferNoFill="1" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferDraw="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                      <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeBorderWidth="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0"/>
-                      <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.7" shadowOffsetGlobal="1" shadowScale="100" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+                    <text-style textOpacity="1" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" namedStyle="Semibold" fontUnderline="0" fieldName="round( $length, 1) || 'm'" multilineHeight="1" fontCapitals="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="#ffffff" fontWordSpacing="0" useSubstitutions="0" fontWeight="63" fontStrikeout="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" fontFamily="Myriad Pro" isExpression="1">
+                      <text-buffer bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="1" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                      <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRotation="0" shapeRotationType="0" shapeSizeX="0" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0"/>
+                      <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusUnit="MM" shadowUnder="0" shadowScale="100" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
                       <substitutions/>
                     </text-style>
-                    <text-format useMaxLineLengthForAutoWrap="1" leftDirectionSymbol="&lt;" wrapChar="" multilineAlign="4294967295" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" decimals="3" rightDirectionSymbol=">" formatNumbers="0"/>
-                    <placement rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="2" priority="5" centroidInside="0" xOffset="0" offsetType="0" yOffset="0" dist="1" distUnits="MM" offsetUnits="MM" quadOffset="4" maxCurvedCharAngleIn="25" placementFlags="15" maxCurvedCharAngleOut="-25" centroidWhole="0" preserveRotation="1" geometryGenerator="" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" distMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" repeatDistance="0" repeatDistanceUnits="MM" fitInPolygonOnly="0"/>
-                    <rendering fontMaxPixelSize="10000" drawLabels="1" mergeLines="0" zIndex="0" upsidedownLabels="0" displayAll="0" obstacleFactor="1" scaleVisibility="0" limitNumLabels="0" obstacleType="0" fontLimitPixelSize="0" maxNumLabels="2000" minFeatureSize="0" fontMinPixelSize="3" labelPerPart="0" obstacle="1" scaleMax="0" scaleMin="0"/>
+                    <text-format wrapChar="" plussign="0" rightDirectionSymbol=">" leftDirectionSymbol="&lt;" formatNumbers="0" decimals="3" multilineAlign="4294967295" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" reverseDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0"/>
+                    <placement quadOffset="4" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" priority="5" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" dist="1" offsetUnits="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" preserveRotation="1" yOffset="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" geometryGenerator="" centroidWhole="0" xOffset="0" placement="2" centroidInside="0" offsetType="0" placementFlags="15" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" maxCurvedCharAngleIn="25" maxCurvedCharAngleOut="-25" distUnits="MM"/>
+                    <rendering limitNumLabels="0" obstacleType="0" obstacle="1" scaleMax="0" maxNumLabels="2000" labelPerPart="0" scaleMin="0" upsidedownLabels="0" zIndex="0" fontLimitPixelSize="0" displayAll="0" minFeatureSize="0" fontMaxPixelSize="10000" scaleVisibility="0" fontMinPixelSize="3" drawLabels="1" mergeLines="0" obstacleFactor="1"/>
                     <dd_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option type="Map" name="properties">
                           <Option type="Map" name="PositionX">
-                            <Option value="true" type="bool" name="active"/>
-                            <Option value="auxiliary_storage_labeling_positionx" type="QString" name="field"/>
-                            <Option value="2" type="int" name="type"/>
+                            <Option type="bool" value="true" name="active"/>
+                            <Option type="QString" value="auxiliary_storage_labeling_positionx" name="field"/>
+                            <Option type="int" value="2" name="type"/>
                           </Option>
                           <Option type="Map" name="PositionY">
-                            <Option value="true" type="bool" name="active"/>
-                            <Option value="auxiliary_storage_labeling_positiony" type="QString" name="field"/>
-                            <Option value="2" type="int" name="type"/>
+                            <Option type="bool" value="true" name="active"/>
+                            <Option type="QString" value="auxiliary_storage_labeling_positiony" name="field"/>
+                            <Option type="int" value="2" name="type"/>
                           </Option>
                         </Option>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </dd_properties>
                   </settings>
@@ -11346,30 +11348,30 @@ def my_form_open(dialog, layer, feature):
               </rules>
             </labeling>
             <customproperties>
-              <property value="id" key="dualview/previewExpressions"/>
-              <property value="0" key="embeddedWidgets/count"/>
+              <property key="dualview/previewExpressions" value="id"/>
+              <property key="embeddedWidgets/count" value="0"/>
               <property key="variableNames"/>
               <property key="variableValues"/>
             </customproperties>
             <blendMode>0</blendMode>
             <featureBlendMode>0</featureBlendMode>
             <layerOpacity>1</layerOpacity>
-            <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-              <DiagramCategory penAlpha="255" width="15" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" minimumSize="0" enabled="0" maxScaleDenominator="1e+08" diagramOrientation="Up" opacity="1" scaleBasedVisibility="0" minScaleDenominator="0" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" labelPlacementMethod="XHeight" lineSizeType="MM" penWidth="0" backgroundAlpha="255" scaleDependency="Area" barWidth="5" sizeType="MM" height="15" penColor="#000000">
+            <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+              <DiagramCategory height="15" scaleDependency="Area" width="15" lineSizeScale="3x:0,0,0,0,0,0" lineSizeType="MM" penColor="#000000" labelPlacementMethod="XHeight" diagramOrientation="Up" barWidth="5" maxScaleDenominator="1e+08" backgroundAlpha="255" minimumSize="0" penWidth="0" penAlpha="255" minScaleDenominator="0" sizeType="MM" backgroundColor="#ffffff" enabled="0" opacity="1" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270">
                 <fontProperties style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
-                <attribute label="" field="" color="#000000"/>
+                <attribute color="#000000" field="" label=""/>
               </DiagramCategory>
             </SingleCategoryDiagramRenderer>
-            <DiagramLayerSettings linePlacementFlags="18" showAll="1" placement="2" zIndex="0" dist="0" obstacle="0" priority="0">
+            <DiagramLayerSettings priority="0" linePlacementFlags="18" obstacle="0" dist="0" zIndex="0" showAll="1" placement="2">
               <properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </properties>
             </DiagramLayerSettings>
-            <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+            <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
               <activeChecks/>
               <checkConfiguration/>
             </geometryOptions>
@@ -11453,17 +11455,17 @@ def my_form_open(dialog, layer, feature):
               </field>
             </fieldConfiguration>
             <aliases>
-              <alias index="0" name="" field="id"/>
-              <alias index="1" name="" field="group"/>
-              <alias index="2" name="" field="comment"/>
-              <alias index="3" name="" field="moveable"/>
-              <alias index="4" name="" field="type"/>
-              <alias index="5" name="" field="name"/>
-              <alias index="6" name="" field="hidden"/>
-              <alias index="7" name="" field="auxiliary_storage_labeling_positiony"/>
-              <alias index="8" name="" field="auxiliary_storage_labeling_positionx"/>
-              <alias index="9" name="" field="fence_len"/>
-              <alias index="10" name="" field="cone_len"/>
+              <alias index="0" field="id" name=""/>
+              <alias index="1" field="group" name=""/>
+              <alias index="2" field="comment" name=""/>
+              <alias index="3" field="moveable" name=""/>
+              <alias index="4" field="type" name=""/>
+              <alias index="5" field="name" name=""/>
+              <alias index="6" field="hidden" name=""/>
+              <alias index="7" field="auxiliary_storage_labeling_positiony" name=""/>
+              <alias index="8" field="auxiliary_storage_labeling_positionx" name=""/>
+              <alias index="9" field="fence_len" name=""/>
+              <alias index="10" field="cone_len" name=""/>
             </aliases>
             <excludeAttributesWMS/>
             <excludeAttributesWFS/>
@@ -11481,53 +11483,53 @@ def my_form_open(dialog, layer, feature):
               <default applyOnUpdate="0" expression="" field="cone_len"/>
             </defaults>
             <constraints>
-              <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="id" constraints="0"/>
-              <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="group" constraints="0"/>
-              <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="comment" constraints="0"/>
-              <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="moveable" constraints="0"/>
-              <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="type" constraints="0"/>
-              <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="name" constraints="0"/>
-              <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="hidden" constraints="0"/>
-              <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="auxiliary_storage_labeling_positiony" constraints="0"/>
-              <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="auxiliary_storage_labeling_positionx" constraints="0"/>
-              <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="fence_len" constraints="0"/>
-              <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="cone_len" constraints="0"/>
+              <constraint exp_strength="0" notnull_strength="0" field="id" constraints="0" unique_strength="0"/>
+              <constraint exp_strength="0" notnull_strength="0" field="group" constraints="0" unique_strength="0"/>
+              <constraint exp_strength="0" notnull_strength="0" field="comment" constraints="0" unique_strength="0"/>
+              <constraint exp_strength="0" notnull_strength="0" field="moveable" constraints="0" unique_strength="0"/>
+              <constraint exp_strength="0" notnull_strength="0" field="type" constraints="0" unique_strength="0"/>
+              <constraint exp_strength="0" notnull_strength="0" field="name" constraints="0" unique_strength="0"/>
+              <constraint exp_strength="0" notnull_strength="0" field="hidden" constraints="0" unique_strength="0"/>
+              <constraint exp_strength="0" notnull_strength="0" field="auxiliary_storage_labeling_positiony" constraints="0" unique_strength="0"/>
+              <constraint exp_strength="0" notnull_strength="0" field="auxiliary_storage_labeling_positionx" constraints="0" unique_strength="0"/>
+              <constraint exp_strength="0" notnull_strength="0" field="fence_len" constraints="0" unique_strength="0"/>
+              <constraint exp_strength="0" notnull_strength="0" field="cone_len" constraints="0" unique_strength="0"/>
             </constraints>
             <constraintExpressions>
-              <constraint exp="" desc="" field="id"/>
-              <constraint exp="" desc="" field="group"/>
-              <constraint exp="" desc="" field="comment"/>
-              <constraint exp="" desc="" field="moveable"/>
-              <constraint exp="" desc="" field="type"/>
-              <constraint exp="" desc="" field="name"/>
-              <constraint exp="" desc="" field="hidden"/>
-              <constraint exp="" desc="" field="auxiliary_storage_labeling_positiony"/>
-              <constraint exp="" desc="" field="auxiliary_storage_labeling_positionx"/>
-              <constraint exp="" desc="" field="fence_len"/>
-              <constraint exp="" desc="" field="cone_len"/>
+              <constraint exp="" field="id" desc=""/>
+              <constraint exp="" field="group" desc=""/>
+              <constraint exp="" field="comment" desc=""/>
+              <constraint exp="" field="moveable" desc=""/>
+              <constraint exp="" field="type" desc=""/>
+              <constraint exp="" field="name" desc=""/>
+              <constraint exp="" field="hidden" desc=""/>
+              <constraint exp="" field="auxiliary_storage_labeling_positiony" desc=""/>
+              <constraint exp="" field="auxiliary_storage_labeling_positionx" desc=""/>
+              <constraint exp="" field="fence_len" desc=""/>
+              <constraint exp="" field="cone_len" desc=""/>
             </constraintExpressions>
             <expressionfields>
-              <field typeName="double precision" subType="0" type="6" name="fence_len" precision="0" length="-1" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" comment=""/>
-              <field typeName="double precision" subType="0" type="6" name="fence_len" precision="0" length="-1" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" comment=""/>
-              <field typeName="double precision" subType="0" type="6" name="cone_len" precision="0" length="-1" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" comment=""/>
+              <field precision="0" type="6" comment="" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" length="-1" subType="0" typeName="double precision" name="fence_len"/>
+              <field precision="0" type="6" comment="" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" length="-1" subType="0" typeName="double precision" name="fence_len"/>
+              <field precision="0" type="6" comment="" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" length="-1" subType="0" typeName="double precision" name="cone_len"/>
             </expressionfields>
             <attributeactions>
-              <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+              <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
             </attributeactions>
             <attributetableconfig sortOrder="0" sortExpression="&quot;group&quot;" actionWidgetStyle="dropDown">
               <columns>
-                <column width="-1" type="field" name="id" hidden="0"/>
-                <column width="-1" type="field" name="group" hidden="0"/>
+                <column width="-1" type="field" hidden="0" name="id"/>
+                <column width="-1" type="field" hidden="0" name="group"/>
                 <column width="-1" type="actions" hidden="1"/>
-                <column width="223" type="field" name="comment" hidden="0"/>
-                <column width="-1" type="field" name="moveable" hidden="0"/>
-                <column width="-1" type="field" name="type" hidden="0"/>
-                <column width="414" type="field" name="name" hidden="0"/>
-                <column width="-1" type="field" name="hidden" hidden="0"/>
-                <column width="-1" type="field" name="fence_len" hidden="0"/>
-                <column width="-1" type="field" name="cone_len" hidden="0"/>
-                <column width="-1" type="field" name="auxiliary_storage_labeling_positiony" hidden="1"/>
-                <column width="-1" type="field" name="auxiliary_storage_labeling_positionx" hidden="1"/>
+                <column width="223" type="field" hidden="0" name="comment"/>
+                <column width="-1" type="field" hidden="0" name="moveable"/>
+                <column width="-1" type="field" hidden="0" name="type"/>
+                <column width="414" type="field" hidden="0" name="name"/>
+                <column width="-1" type="field" hidden="0" name="hidden"/>
+                <column width="-1" type="field" hidden="0" name="fence_len"/>
+                <column width="-1" type="field" hidden="0" name="cone_len"/>
+                <column width="-1" type="field" hidden="1" name="auxiliary_storage_labeling_positiony"/>
+                <column width="-1" type="field" hidden="1" name="auxiliary_storage_labeling_positionx"/>
               </columns>
             </attributetableconfig>
             <conditionalstyles>
@@ -11558,32 +11560,32 @@ def my_form_open(dialog, layer, feature):
             <featformsuppress>0</featformsuppress>
             <editorlayout>generatedlayout</editorlayout>
             <editable>
-              <field name="auxiliary_storage_labeling_positionx" editable="0"/>
-              <field name="auxiliary_storage_labeling_positiony" editable="0"/>
-              <field name="comment" editable="1"/>
-              <field name="cone_len" editable="0"/>
-              <field name="fence_len" editable="0"/>
-              <field name="group" editable="1"/>
-              <field name="hidden" editable="1"/>
-              <field name="id" editable="1"/>
-              <field name="length" editable="0"/>
-              <field name="moveable" editable="1"/>
-              <field name="name" editable="1"/>
-              <field name="type" editable="1"/>
+              <field editable="0" name="auxiliary_storage_labeling_positionx"/>
+              <field editable="0" name="auxiliary_storage_labeling_positiony"/>
+              <field editable="1" name="comment"/>
+              <field editable="0" name="cone_len"/>
+              <field editable="0" name="fence_len"/>
+              <field editable="1" name="group"/>
+              <field editable="1" name="hidden"/>
+              <field editable="1" name="id"/>
+              <field editable="0" name="length"/>
+              <field editable="1" name="moveable"/>
+              <field editable="1" name="name"/>
+              <field editable="1" name="type"/>
             </editable>
             <labelOnTop>
-              <field name="auxiliary_storage_labeling_positionx" labelOnTop="0"/>
-              <field name="auxiliary_storage_labeling_positiony" labelOnTop="0"/>
-              <field name="comment" labelOnTop="0"/>
-              <field name="cone_len" labelOnTop="0"/>
-              <field name="fence_len" labelOnTop="0"/>
-              <field name="group" labelOnTop="0"/>
-              <field name="hidden" labelOnTop="0"/>
-              <field name="id" labelOnTop="0"/>
-              <field name="length" labelOnTop="0"/>
-              <field name="moveable" labelOnTop="0"/>
-              <field name="name" labelOnTop="0"/>
-              <field name="type" labelOnTop="0"/>
+              <field labelOnTop="0" name="auxiliary_storage_labeling_positionx"/>
+              <field labelOnTop="0" name="auxiliary_storage_labeling_positiony"/>
+              <field labelOnTop="0" name="comment"/>
+              <field labelOnTop="0" name="cone_len"/>
+              <field labelOnTop="0" name="fence_len"/>
+              <field labelOnTop="0" name="group"/>
+              <field labelOnTop="0" name="hidden"/>
+              <field labelOnTop="0" name="id"/>
+              <field labelOnTop="0" name="length"/>
+              <field labelOnTop="0" name="moveable"/>
+              <field labelOnTop="0" name="name"/>
+              <field labelOnTop="0" name="type"/>
             </labelOnTop>
             <widgets/>
             <previewExpression>id</previewExpression>
@@ -11600,58 +11602,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" startExpression="" mode="0" limitMode="0" endField="" fixedDuration="0" accumulate="0" durationUnit="min" startField="" endExpression="" enabled="0">
+      <temporal durationField="" fixedDuration="0" accumulate="0" endField="" startField="" enabled="0" startExpression="" endExpression="" durationUnit="min" mode="0" limitMode="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" zscale="1" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" binding="Centroid" type="IndividualFeatures" symbology="Line" extrusion="0" zoffset="0">
+      <elevation extrusionEnabled="0" symbology="Line" type="IndividualFeatures" zscale="1" clamping="Terrain" showMarkerSymbolInSurfacePlots="0" zoffset="0" extrusion="0" respectLayerSymbol="1" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="133,182,111,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="133,182,111,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -11682,36 +11684,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="133,182,111,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="95,130,79,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="133,182,111,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="95,130,79,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="133,182,111,255"/>
@@ -11726,44 +11728,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="133,182,111,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="95,130,79,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="133,182,111,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="diamond" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="95,130,79,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="3" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -11786,64 +11788,64 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" type="RuleRenderer" symbollevels="1" referencescale="-1" enableorderby="0">
+      <renderer-v2 enableorderby="0" type="RuleRenderer" symbollevels="1" referencescale="-1" forceraster="0">
         <rules key="{1747eeb3-5193-4fd1-bb47-6984c7977e45}">
-          <rule filter="regexp_match(attribute( @atlas_feature , 'type' ), '^(cone|fenc|marshal)')" label="Show in fencing maps" key="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}">
-            <rule filter="regexp_match(&quot;type&quot;, '^cone')" symbol="0" label="Cones" key="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
-            <rule filter="regexp_match(&quot;type&quot;, '^fenc') AND &quot;moveable&quot; IS '1'" symbol="1" label="Moveable fences" key="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
-            <rule filter="regexp_match(&quot;type&quot;, '^fenc') AND NOT &quot;moveable&quot; IS '1'" symbol="2" label="Fixed fences" key="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
-            <rule filter="regexp_match(&quot;type&quot;, '^constr')" symbol="3" label="Construction" checkstate="0" key="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
+          <rule label="Show in fencing maps" key="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" filter="regexp_match(attribute( @atlas_feature , 'type' ), '^(cone|fenc|marshal)')">
+            <rule symbol="0" label="Cones" key="{55e15f58-d121-44dd-9fec-2e77eb26097f}" filter="regexp_match(&quot;type&quot;, '^cone')"/>
+            <rule symbol="1" label="Moveable fences" key="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}" filter="regexp_match(&quot;type&quot;, '^fenc') AND &quot;moveable&quot; IS '1'"/>
+            <rule symbol="2" label="Fixed fences" key="{070da3c0-926e-4be7-b593-17a3235a88fa}" filter="regexp_match(&quot;type&quot;, '^fenc') AND NOT &quot;moveable&quot; IS '1'"/>
+            <rule symbol="3" label="Construction" key="{7be11354-6d79-48d0-a650-aea5f58c1846}" filter="regexp_match(&quot;type&quot;, '^constr')" checkstate="0"/>
           </rule>
-          <rule filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" symbol="4" label="Is Visible" checkstate="0" key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}"/>
+          <rule symbol="4" label="Is Visible" key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" checkstate="0"/>
           <rule symbol="5" key="{29865286-9e35-459b-929c-beb87e7538de}"/>
         </rules>
         <symbols>
-          <symbol is_animated="0" type="line" name="0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="round" type="QString" name="capstyle"/>
-                <Option value="1;4" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="Point" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="round" type="QString" name="joinstyle"/>
-                <Option value="255,255,0,255" type="QString" name="line_color"/>
-                <Option value="dot" type="QString" name="line_style"/>
-                <Option value="1" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="1" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="round" name="capstyle"/>
+                <Option type="QString" value="1;4" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="Point" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="round" name="joinstyle"/>
+                <Option type="QString" value="255,255,0,255" name="line_color"/>
+                <Option type="QString" value="dot" name="line_style"/>
+                <Option type="QString" value="1" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="1" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="round"/>
@@ -11874,56 +11876,56 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" type="line" name="1" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="round" type="QString" name="capstyle"/>
-                <Option value="4;3" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="round" type="QString" name="joinstyle"/>
-                <Option value="255,255,0,255" type="QString" name="line_color"/>
-                <Option value="dash" type="QString" name="line_style"/>
-                <Option value="1" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="round" name="capstyle"/>
+                <Option type="QString" value="4;3" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="round" name="joinstyle"/>
+                <Option type="QString" value="255,255,0,255" name="line_color"/>
+                <Option type="QString" value="dash" name="line_style"/>
+                <Option type="QString" value="1" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="round"/>
@@ -11954,56 +11956,56 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" type="line" name="2" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="2">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="255,255,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.8" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="255,255,0,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.8" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -12034,56 +12036,56 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" type="line" name="3" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="3">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0,255,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.8" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0,255,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.8" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -12114,56 +12116,56 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( attribute( @atlas_feature , 'group' ) != &quot;group&quot;, '#640000ff', '#ff0000ff' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if( attribute( @atlas_feature , 'group' ) != &quot;group&quot;, '#640000ff', '#ff0000ff' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" type="line" name="4" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="4">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="255,255,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.26" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="255,255,0,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.26" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -12194,50 +12196,50 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" type="line" name="5" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="5">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="213,180,60,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.26" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="213,180,60,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.26" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -12268,9 +12270,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -12279,34 +12281,34 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="rule-based">
         <rules key="{75ef682c-4a85-4fe1-962a-6082490a3c19}">
-          <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;" key="{05a5f0dd-6b57-4866-8227-d1dd0f4dfdf5}">
+          <rule key="{05a5f0dd-6b57-4866-8227-d1dd0f4dfdf5}" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;">
             <settings calloutType="simple">
-              <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="50" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="0.80000000000000004" fieldName="comment" useSubstitutions="0" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="11" namedStyle="Regular" forcedItalic="0" isExpression="0" fontSizeUnit="Point" allowHtml="0" legendString="Aa">
+              <text-style textOpacity="0.80000000000000004" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="Regular" fontUnderline="0" fieldName="comment" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" useSubstitutions="0" fontWeight="50" fontStrikeout="0" fontItalic="0" fontSize="11" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" isExpression="0" legendString="Aa" textOrientation="horizontal">
                 <families/>
-                <text-buffer bufferNoFill="1" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="0"/>
-                <background shapeRadiiY="1" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="1" shapeFillColor="255,255,255,255" shapeDraw="1" shapeBorderWidth="0.59999999999999998" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="1" shapeType="0" shapeJoinStyle="128" shapeOffsetUnit="MM" shapeBorderColor="255,255,0,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="0.59999999999999998" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="1" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-                  <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+                <text-buffer bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+                <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskType="0"/>
+                <background shapeRadiiY="1" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="255,255,0,255" shapeRotationType="0" shapeSizeX="1" shapeDraw="1" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="128" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0.59999999999999998" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="0.59999999999999998" shapeSizeY="1" shapeRadiiX="1">
+                  <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="255,255,255,255" type="QString" name="color"/>
-                        <Option value="round" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="255,255,0,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0.6" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="255,255,255,255" name="color"/>
+                        <Option type="QString" value="round" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="255,255,0,255" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0.6" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="255,255,255,255"/>
@@ -12321,110 +12323,110 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option type="Map" name="properties">
                       <Option type="Map" name="PositionX">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="auxiliary_storage_labeling_positionx" type="QString" name="field"/>
-                        <Option value="2" type="int" name="type"/>
+                        <Option type="bool" value="true" name="active"/>
+                        <Option type="QString" value="auxiliary_storage_labeling_positionx" name="field"/>
+                        <Option type="int" value="2" name="type"/>
                       </Option>
                       <Option type="Map" name="PositionY">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="auxiliary_storage_labeling_positiony" type="QString" name="field"/>
-                        <Option value="2" type="int" name="type"/>
+                        <Option type="bool" value="true" name="active"/>
+                        <Option type="QString" value="auxiliary_storage_labeling_positiony" name="field"/>
+                        <Option type="int" value="2" name="type"/>
                       </Option>
                     </Option>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format useMaxLineLengthForAutoWrap="1" leftDirectionSymbol="&lt;" wrapChar="" multilineAlign="4294967295" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" decimals="3" rightDirectionSymbol=">" formatNumbers="0"/>
-              <placement overlapHandling="AllowOverlapIfRequired" lineAnchorType="0" centroidInside="0" overrunDistance="0" centroidWhole="0" geometryGeneratorEnabled="0" rotationAngle="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" geometryGeneratorType="PointGeometry" quadOffset="4" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="2" xOffset="0" allowDegraded="1" lineAnchorTextPoint="CenterOfText" layerType="UnknownGeometry" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" maxCurvedCharAngleOut="-25" repeatDistance="0" offsetUnits="MM" repeatDistanceUnits="MM" dist="5" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" distUnits="MM" lineAnchorClipping="0" placementFlags="14" priority="5" overrunDistanceUnit="MM" maxCurvedCharAngleIn="25" geometryGenerator="" lineAnchorPercent="0.5" yOffset="0" rotationUnit="AngleDegrees"/>
-              <rendering fontMaxPixelSize="10000" drawLabels="1" mergeLines="1" zIndex="0" upsidedownLabels="0" obstacleFactor="1.8200000000000001" scaleVisibility="0" limitNumLabels="0" obstacleType="0" fontLimitPixelSize="0" maxNumLabels="2000" minFeatureSize="0" fontMinPixelSize="3" labelPerPart="0" obstacle="1" scaleMax="0" scaleMin="0" unplacedVisibility="0"/>
+              <text-format wrapChar="" rightDirectionSymbol=">" plussign="0" leftDirectionSymbol="&lt;" formatNumbers="0" decimals="3" multilineAlign="4294967295" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
+              <placement offsetUnits="MM" xOffset="0" maxCurvedCharAngleOut="-25" layerType="UnknownGeometry" allowDegraded="1" yOffset="0" overlapHandling="AllowOverlapIfRequired" geometryGeneratorType="PointGeometry" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" repeatDistanceUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25" quadOffset="4" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidWhole="0" overrunDistance="0" overrunDistanceUnit="MM" centroidInside="0" placement="2" geometryGenerator="" priority="5" distUnits="MM" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" dist="5" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorTextPoint="CenterOfText" polygonPlacementFlags="2" rotationUnit="AngleDegrees" offsetType="0" placementFlags="14" repeatDistance="0"/>
+              <rendering limitNumLabels="0" obstacleType="0" obstacle="1" scaleMax="0" maxNumLabels="2000" labelPerPart="0" scaleMin="0" upsidedownLabels="0" zIndex="0" unplacedVisibility="0" fontLimitPixelSize="0" minFeatureSize="0" fontMaxPixelSize="10000" scaleVisibility="0" fontMinPixelSize="3" drawLabels="1" mergeLines="1" obstacleFactor="1.8200000000000001"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="PositionX">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="auxiliary_storage_labeling_positionx" type="QString" name="field"/>
-                      <Option value="2" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="auxiliary_storage_labeling_positionx" name="field"/>
+                      <Option type="int" value="2" name="type"/>
                     </Option>
                     <Option type="Map" name="PositionY">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="auxiliary_storage_labeling_positiony" type="QString" name="field"/>
-                      <Option value="2" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="auxiliary_storage_labeling_positiony" name="field"/>
+                      <Option type="int" value="2" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+                  <Option type="int" value="0" name="blendMode"/>
                   <Option type="Map" name="ddProperties">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
-                  <Option value="false" type="bool" name="drawToAllParts"/>
-                  <Option value="0" type="QString" name="enabled"/>
-                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                  <Option value="&lt;symbol is_animated=&quot;0&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                  <Option value="0" type="double" name="minLength"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                  <Option value="MM" type="QString" name="minLengthUnit"/>
-                  <Option value="0" type="double" name="offsetFromAnchor"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                  <Option value="0" type="double" name="offsetFromLabel"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                  <Option type="bool" value="false" name="drawToAllParts"/>
+                  <Option type="QString" value="0" name="enabled"/>
+                  <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
+                  <Option type="QString" value="&lt;symbol alpha=&quot;1&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
+                  <Option type="double" value="0" name="minLength"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
+                  <Option type="QString" value="MM" name="minLengthUnit"/>
+                  <Option type="double" value="0" name="offsetFromAnchor"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
+                  <Option type="double" value="0" name="offsetFromLabel"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^(fenc|cone)')" key="{226e1338-ed15-4fc8-a035-fefee03c38d6}">
+          <rule key="{226e1338-ed15-4fc8-a035-fefee03c38d6}" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^(fenc|cone)')">
             <settings calloutType="simple">
-              <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="63" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="1" fieldName="round( $length, 1) || 'm'" useSubstitutions="0" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="11" namedStyle="Semibold" forcedItalic="0" isExpression="1" fontSizeUnit="Point" allowHtml="0" legendString="Aa">
+              <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="Semibold" fontUnderline="0" fieldName="round( $length, 1) || 'm'" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" useSubstitutions="0" fontWeight="63" fontStrikeout="0" fontItalic="0" fontSize="11" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" isExpression="1" legendString="Aa" textOrientation="horizontal">
                 <families/>
-                <text-buffer bufferNoFill="1" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferDraw="1" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="0"/>
-                <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeBorderWidth="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-                  <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+                <text-buffer bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+                <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskType="0"/>
+                <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
+                  <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="255,255,255,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                        <Option value="no" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="255,255,255,255" name="color"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                        <Option type="QString" value="no" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="255,255,255,255"/>
@@ -12439,88 +12441,88 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option type="Map" name="properties">
                       <Option type="Map" name="AlwaysShow">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="QString" name="expression"/>
-                        <Option value="3" type="int" name="type"/>
+                        <Option type="bool" value="false" name="active"/>
+                        <Option type="QString" value="1" name="expression"/>
+                        <Option type="int" value="3" name="type"/>
                       </Option>
                       <Option type="Map" name="PositionX">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="auxiliary_storage_labeling_positionx" type="QString" name="field"/>
-                        <Option value="2" type="int" name="type"/>
+                        <Option type="bool" value="true" name="active"/>
+                        <Option type="QString" value="auxiliary_storage_labeling_positionx" name="field"/>
+                        <Option type="int" value="2" name="type"/>
                       </Option>
                       <Option type="Map" name="PositionY">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="auxiliary_storage_labeling_positiony" type="QString" name="field"/>
-                        <Option value="2" type="int" name="type"/>
+                        <Option type="bool" value="true" name="active"/>
+                        <Option type="QString" value="auxiliary_storage_labeling_positiony" name="field"/>
+                        <Option type="int" value="2" name="type"/>
                       </Option>
                     </Option>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format useMaxLineLengthForAutoWrap="1" leftDirectionSymbol="&lt;" wrapChar="" multilineAlign="4294967295" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" decimals="3" rightDirectionSymbol=">" formatNumbers="0"/>
-              <placement overlapHandling="AllowOverlapIfRequired" lineAnchorType="0" centroidInside="0" overrunDistance="0" centroidWhole="0" geometryGeneratorEnabled="0" rotationAngle="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" geometryGeneratorType="PointGeometry" quadOffset="4" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="2" xOffset="0" allowDegraded="1" lineAnchorTextPoint="CenterOfText" layerType="UnknownGeometry" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" maxCurvedCharAngleOut="-25" repeatDistance="0" offsetUnits="MM" repeatDistanceUnits="MM" dist="1" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" distUnits="MM" lineAnchorClipping="0" placementFlags="14" priority="6" overrunDistanceUnit="MM" maxCurvedCharAngleIn="25" geometryGenerator="" lineAnchorPercent="0.5" yOffset="0" rotationUnit="AngleDegrees"/>
-              <rendering fontMaxPixelSize="10000" drawLabels="1" mergeLines="0" zIndex="0" upsidedownLabels="0" obstacleFactor="1" scaleVisibility="0" limitNumLabels="0" obstacleType="0" fontLimitPixelSize="0" maxNumLabels="2000" minFeatureSize="0" fontMinPixelSize="3" labelPerPart="0" obstacle="1" scaleMax="0" scaleMin="0" unplacedVisibility="0"/>
+              <text-format wrapChar="" rightDirectionSymbol=">" plussign="0" leftDirectionSymbol="&lt;" formatNumbers="0" decimals="3" multilineAlign="4294967295" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
+              <placement offsetUnits="MM" xOffset="0" maxCurvedCharAngleOut="-25" layerType="UnknownGeometry" allowDegraded="1" yOffset="0" overlapHandling="AllowOverlapIfRequired" geometryGeneratorType="PointGeometry" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" repeatDistanceUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25" quadOffset="4" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidWhole="0" overrunDistance="0" overrunDistanceUnit="MM" centroidInside="0" placement="2" geometryGenerator="" priority="6" distUnits="MM" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" dist="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorTextPoint="CenterOfText" polygonPlacementFlags="2" rotationUnit="AngleDegrees" offsetType="0" placementFlags="14" repeatDistance="0"/>
+              <rendering limitNumLabels="0" obstacleType="0" obstacle="1" scaleMax="0" maxNumLabels="2000" labelPerPart="0" scaleMin="0" upsidedownLabels="0" zIndex="0" unplacedVisibility="0" fontLimitPixelSize="0" minFeatureSize="0" fontMaxPixelSize="10000" scaleVisibility="0" fontMinPixelSize="3" drawLabels="1" mergeLines="0" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="AlwaysShow">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="QString" value="1" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="PositionX">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="auxiliary_storage_labeling_positionx" type="QString" name="field"/>
-                      <Option value="2" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="auxiliary_storage_labeling_positionx" name="field"/>
+                      <Option type="int" value="2" name="type"/>
                     </Option>
                     <Option type="Map" name="PositionY">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="auxiliary_storage_labeling_positiony" type="QString" name="field"/>
-                      <Option value="2" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="auxiliary_storage_labeling_positiony" name="field"/>
+                      <Option type="int" value="2" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+                  <Option type="int" value="0" name="blendMode"/>
                   <Option type="Map" name="ddProperties">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
-                  <Option value="false" type="bool" name="drawToAllParts"/>
-                  <Option value="0" type="QString" name="enabled"/>
-                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                  <Option value="&lt;symbol is_animated=&quot;0&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                  <Option value="0" type="double" name="minLength"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                  <Option value="MM" type="QString" name="minLengthUnit"/>
-                  <Option value="0" type="double" name="offsetFromAnchor"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                  <Option value="0" type="double" name="offsetFromLabel"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                  <Option type="bool" value="false" name="drawToAllParts"/>
+                  <Option type="QString" value="0" name="enabled"/>
+                  <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
+                  <Option type="QString" value="&lt;symbol alpha=&quot;1&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
+                  <Option type="double" value="0" name="minLength"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
+                  <Option type="QString" value="MM" name="minLengthUnit"/>
+                  <Option type="double" value="0" name="offsetFromAnchor"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
+                  <Option type="double" value="0" name="offsetFromLabel"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
@@ -12529,11 +12531,11 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option value="id" type="QString" name="dualview/previewExpressions"/>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="QString" value="copy" name="QFieldSync/action"/>
+          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="id" name="dualview/previewExpressions"/>
+          <Option type="QString" value="0" name="embeddedWidgets/count"/>
           <Option type="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -12541,48 +12543,48 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory penAlpha="255" width="15" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" minimumSize="0" enabled="0" maxScaleDenominator="1e+08" diagramOrientation="Up" opacity="1" scaleBasedVisibility="0" spacingUnit="MM" minScaleDenominator="0" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" lineSizeType="MM" penWidth="0" backgroundAlpha="255" scaleDependency="Area" spacing="0" direction="1" barWidth="5" sizeType="MM" height="15" penColor="#000000" showAxis="0">
-          <fontProperties bold="0" style="" italic="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0"/>
-          <attribute label="" colorOpacity="1" field="" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory height="15" scaleDependency="Area" width="15" lineSizeScale="3x:0,0,0,0,0,0" spacingUnit="MM" lineSizeType="MM" penColor="#000000" spacing="0" labelPlacementMethod="XHeight" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" backgroundAlpha="255" maxScaleDenominator="1e+08" barWidth="5" penWidth="0" minimumSize="0" penAlpha="255" minScaleDenominator="0" sizeType="MM" backgroundColor="#ffffff" enabled="0" opacity="1" direction="1" scaleBasedVisibility="0" showAxis="0" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270">
+          <fontProperties style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0" strikethrough="0" italic="0" underline="0" bold="0"/>
+          <attribute color="#000000" field="" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="35,35,35,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0.26" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -12613,9 +12615,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -12623,20 +12625,20 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" showAll="1" placement="2" zIndex="0" dist="0" priority="0" obstacle="0">
+      <DiagramLayerSettings priority="0" linePlacementFlags="18" obstacle="0" dist="0" zIndex="0" placement="2" showAll="1">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field configurationFlags="None" name="id">
@@ -12704,69 +12706,69 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
-        <alias index="1" name="" field="group"/>
-        <alias index="2" name="" field="comment"/>
-        <alias index="3" name="" field="moveable"/>
-        <alias index="4" name="" field="type"/>
-        <alias index="5" name="" field="name"/>
-        <alias index="6" name="" field="hidden"/>
-        <alias index="7" name="" field="fence_len"/>
-        <alias index="8" name="" field="cone_len"/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="group" name=""/>
+        <alias index="2" field="comment" name=""/>
+        <alias index="3" field="moveable" name=""/>
+        <alias index="4" field="type" name=""/>
+        <alias index="5" field="name" name=""/>
+        <alias index="6" field="hidden" name=""/>
+        <alias index="7" field="fence_len" name=""/>
+        <alias index="8" field="cone_len" name=""/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="group"/>
-        <default applyOnUpdate="0" expression="" field="comment"/>
-        <default applyOnUpdate="0" expression="" field="moveable"/>
-        <default applyOnUpdate="0" expression="" field="type"/>
-        <default applyOnUpdate="0" expression="" field="name"/>
-        <default applyOnUpdate="0" expression="" field="hidden"/>
-        <default applyOnUpdate="0" expression="" field="fence_len"/>
-        <default applyOnUpdate="0" expression="" field="cone_len"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="group" expression=""/>
+        <default applyOnUpdate="0" field="comment" expression=""/>
+        <default applyOnUpdate="0" field="moveable" expression=""/>
+        <default applyOnUpdate="0" field="type" expression=""/>
+        <default applyOnUpdate="0" field="name" expression=""/>
+        <default applyOnUpdate="0" field="hidden" expression=""/>
+        <default applyOnUpdate="0" field="fence_len" expression=""/>
+        <default applyOnUpdate="0" field="cone_len" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="id" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="group" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="comment" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="moveable" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="type" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="name" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="hidden" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="fence_len" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="cone_len" constraints="0"/>
+        <constraint exp_strength="0" field="id" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="group" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="comment" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="moveable" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="type" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="name" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="hidden" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="fence_len" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="cone_len" notnull_strength="0" constraints="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" desc="" field="id"/>
-        <constraint exp="" desc="" field="group"/>
-        <constraint exp="" desc="" field="comment"/>
-        <constraint exp="" desc="" field="moveable"/>
-        <constraint exp="" desc="" field="type"/>
-        <constraint exp="" desc="" field="name"/>
-        <constraint exp="" desc="" field="hidden"/>
-        <constraint exp="" desc="" field="fence_len"/>
-        <constraint exp="" desc="" field="cone_len"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="group" desc=""/>
+        <constraint exp="" field="comment" desc=""/>
+        <constraint exp="" field="moveable" desc=""/>
+        <constraint exp="" field="type" desc=""/>
+        <constraint exp="" field="name" desc=""/>
+        <constraint exp="" field="hidden" desc=""/>
+        <constraint exp="" field="fence_len" desc=""/>
+        <constraint exp="" field="cone_len" desc=""/>
       </constraintExpressions>
       <expressionfields>
-        <field typeName="double precision" subType="0" type="6" name="fence_len" precision="0" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" length="-1" comment=""/>
-        <field typeName="double precision" subType="0" type="6" name="fence_len" precision="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" length="-1" comment=""/>
-        <field typeName="double precision" subType="0" type="6" name="cone_len" precision="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" length="-1" comment=""/>
+        <field precision="0" comment="" type="6" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" length="-1" subType="0" typeName="double precision" name="fence_len"/>
+        <field precision="0" comment="" type="6" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" length="-1" subType="0" typeName="double precision" name="fence_len"/>
+        <field precision="0" comment="" type="6" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" length="-1" subType="0" typeName="double precision" name="cone_len"/>
       </expressionfields>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="&quot;group&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="&quot;group&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column width="-1" type="field" name="id" hidden="0"/>
-          <column width="-1" type="field" name="group" hidden="0"/>
+          <column width="-1" type="field" hidden="0" name="id"/>
+          <column width="-1" type="field" hidden="0" name="group"/>
           <column width="-1" type="actions" hidden="1"/>
-          <column width="373" type="field" name="comment" hidden="0"/>
-          <column width="-1" type="field" name="moveable" hidden="0"/>
-          <column width="-1" type="field" name="type" hidden="0"/>
-          <column width="692" type="field" name="name" hidden="0"/>
-          <column width="-1" type="field" name="hidden" hidden="0"/>
-          <column width="-1" type="field" name="fence_len" hidden="0"/>
-          <column width="-1" type="field" name="cone_len" hidden="0"/>
+          <column width="373" type="field" hidden="0" name="comment"/>
+          <column width="-1" type="field" hidden="0" name="moveable"/>
+          <column width="-1" type="field" hidden="0" name="type"/>
+          <column width="692" type="field" hidden="0" name="name"/>
+          <column width="-1" type="field" hidden="0" name="hidden"/>
+          <column width="-1" type="field" hidden="0" name="fence_len"/>
+          <column width="-1" type="field" hidden="0" name="cone_len"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -12798,32 +12800,32 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="auxiliary_storage_labeling_positionx" editable="0"/>
-        <field name="auxiliary_storage_labeling_positiony" editable="0"/>
-        <field name="comment" editable="1"/>
-        <field name="cone_len" editable="0"/>
-        <field name="fence_len" editable="0"/>
-        <field name="group" editable="1"/>
-        <field name="hidden" editable="1"/>
-        <field name="id" editable="1"/>
-        <field name="length" editable="0"/>
-        <field name="moveable" editable="1"/>
-        <field name="name" editable="1"/>
-        <field name="type" editable="1"/>
+        <field editable="0" name="auxiliary_storage_labeling_positionx"/>
+        <field editable="0" name="auxiliary_storage_labeling_positiony"/>
+        <field editable="1" name="comment"/>
+        <field editable="0" name="cone_len"/>
+        <field editable="0" name="fence_len"/>
+        <field editable="1" name="group"/>
+        <field editable="1" name="hidden"/>
+        <field editable="1" name="id"/>
+        <field editable="0" name="length"/>
+        <field editable="1" name="moveable"/>
+        <field editable="1" name="name"/>
+        <field editable="1" name="type"/>
       </editable>
       <labelOnTop>
-        <field name="auxiliary_storage_labeling_positionx" labelOnTop="0"/>
-        <field name="auxiliary_storage_labeling_positiony" labelOnTop="0"/>
-        <field name="comment" labelOnTop="0"/>
-        <field name="cone_len" labelOnTop="0"/>
-        <field name="fence_len" labelOnTop="0"/>
-        <field name="group" labelOnTop="0"/>
-        <field name="hidden" labelOnTop="0"/>
-        <field name="id" labelOnTop="0"/>
-        <field name="length" labelOnTop="0"/>
-        <field name="moveable" labelOnTop="0"/>
-        <field name="name" labelOnTop="0"/>
-        <field name="type" labelOnTop="0"/>
+        <field labelOnTop="0" name="auxiliary_storage_labeling_positionx"/>
+        <field labelOnTop="0" name="auxiliary_storage_labeling_positiony"/>
+        <field labelOnTop="0" name="comment"/>
+        <field labelOnTop="0" name="cone_len"/>
+        <field labelOnTop="0" name="fence_len"/>
+        <field labelOnTop="0" name="group"/>
+        <field labelOnTop="0" name="hidden"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="length"/>
+        <field labelOnTop="0" name="moveable"/>
+        <field labelOnTop="0" name="name"/>
+        <field labelOnTop="0" name="type"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -12831,7 +12833,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" simplifyLocal="1" autoRefreshTime="0" wkbType="MultiLineString" simplifyDrawingHints="1" type="vector" symbologyReferenceScale="-1" minScale="100000000" legendPlaceholderImage="" refreshOnNotifyEnabled="0" labelsEnabled="0" maxScale="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" refreshOnNotifyMessage="" readOnly="0" geometry="Line" autoRefreshEnabled="0" simplifyDrawingTol="1">
+    <maplayer simplifyLocal="1" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1" legendPlaceholderImage="" symbologyReferenceScale="-1" readOnly="0" refreshOnNotifyEnabled="0" minScale="100000000" maxScale="0" type="vector" autoRefreshTime="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="0" styleCategories="AllStyleCategories" geometry="Line" autoRefreshEnabled="0" wkbType="MultiLineString">
       <extent>
         <xmin>18.39891270000000034</xmin>
         <ymin>-33.90990359999999981</ymin>
@@ -12904,58 +12906,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" startExpression="" mode="0" limitMode="0" endField="" fixedDuration="0" accumulate="0" durationUnit="min" startField="" endExpression="" enabled="0">
+      <temporal durationField="" fixedDuration="0" accumulate="0" endField="" startField="" enabled="0" startExpression="" endExpression="" durationUnit="min" mode="0" limitMode="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" zscale="1" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" binding="Centroid" type="IndividualFeatures" symbology="Line" extrusion="0" zoffset="0">
+      <elevation extrusionEnabled="0" symbology="Line" type="IndividualFeatures" zscale="1" clamping="Terrain" showMarkerSymbolInSurfacePlots="0" zoffset="0" extrusion="0" respectLayerSymbol="1" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="164,113,88,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="164,113,88,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -12986,36 +12988,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="164,113,88,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="117,81,63,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="164,113,88,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="117,81,63,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="164,113,88,255"/>
@@ -13030,44 +13032,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="164,113,88,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="117,81,63,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="164,113,88,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="diamond" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="117,81,63,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="3" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -13090,54 +13092,54 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" type="singleSymbol" symbollevels="0" referencescale="-1" enableorderby="0">
+      <renderer-v2 enableorderby="0" type="singleSymbol" symbollevels="0" referencescale="-1" forceraster="0">
         <symbols>
-          <symbol is_animated="0" type="line" name="0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,178,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="1" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,178,0,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="1" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -13168,9 +13170,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -13181,11 +13183,11 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option value="&quot;id&quot;" type="QString" name="dualview/previewExpressions"/>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="QString" value="copy" name="QFieldSync/action"/>
+          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="&quot;id&quot;" name="dualview/previewExpressions"/>
+          <Option type="QString" value="0" name="embeddedWidgets/count"/>
           <Option type="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -13193,48 +13195,48 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory penAlpha="255" width="15" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" minimumSize="0" enabled="0" maxScaleDenominator="1e+08" diagramOrientation="Up" opacity="1" scaleBasedVisibility="0" spacingUnit="MM" minScaleDenominator="0" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" lineSizeType="MM" penWidth="0" backgroundAlpha="255" scaleDependency="Area" spacing="0" direction="1" barWidth="5" sizeType="MM" height="15" penColor="#000000" showAxis="0">
-          <fontProperties bold="0" style="0" italic="1" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" strikethrough="0"/>
-          <attribute label="" colorOpacity="1" field="" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory height="15" scaleDependency="Area" width="15" lineSizeScale="3x:0,0,0,0,0,0" spacingUnit="MM" lineSizeType="MM" penColor="#000000" spacing="0" labelPlacementMethod="XHeight" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" backgroundAlpha="255" maxScaleDenominator="1e+08" barWidth="5" penWidth="0" minimumSize="0" penAlpha="255" minScaleDenominator="0" sizeType="MM" backgroundColor="#ffffff" enabled="0" opacity="1" direction="1" scaleBasedVisibility="0" showAxis="0" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270">
+          <fontProperties style="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" strikethrough="0" italic="1" underline="0" bold="0"/>
+          <attribute color="#000000" field="" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="35,35,35,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0.26" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -13265,9 +13267,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -13275,20 +13277,20 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" showAll="1" placement="2" zIndex="0" dist="0" priority="0" obstacle="0">
+      <DiagramLayerSettings priority="0" linePlacementFlags="18" obstacle="0" dist="0" zIndex="0" placement="2" showAll="1">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field configurationFlags="None" name="id">
@@ -13300,24 +13302,24 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
+        <alias index="0" field="id" name=""/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="id" constraints="0"/>
+        <constraint exp_strength="0" field="id" notnull_strength="0" constraints="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" desc="" field="id"/>
+        <constraint exp="" field="id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column width="-1" type="field" name="id" hidden="0"/>
+          <column width="-1" type="field" hidden="0" name="id"/>
           <column width="-1" type="actions" hidden="1"/>
         </columns>
       </attributetableconfig>
@@ -13350,10 +13352,10 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="id" editable="1"/>
+        <field editable="1" name="id"/>
       </editable>
       <labelOnTop>
-        <field name="id" labelOnTop="0"/>
+        <field labelOnTop="0" name="id"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -13361,7 +13363,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" simplifyLocal="1" autoRefreshTime="0" wkbType="MultiPolygon" simplifyDrawingHints="1" type="vector" symbologyReferenceScale="-1" minScale="100000000" legendPlaceholderImage="" refreshOnNotifyEnabled="0" labelsEnabled="0" maxScale="100000" styleCategories="AllStyleCategories" simplifyAlgorithm="0" refreshOnNotifyMessage="" readOnly="0" geometry="Polygon" autoRefreshEnabled="0" simplifyDrawingTol="1">
+    <maplayer simplifyLocal="1" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1" legendPlaceholderImage="" symbologyReferenceScale="-1" readOnly="0" refreshOnNotifyEnabled="0" minScale="100000000" maxScale="100000" type="vector" autoRefreshTime="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="0" styleCategories="AllStyleCategories" geometry="Polygon" autoRefreshEnabled="0" wkbType="MultiPolygon">
       <extent>
         <xmin>18.36924763341120581</xmin>
         <ymin>-33.95871753779982782</ymin>
@@ -13434,58 +13436,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" startExpression="" mode="0" limitMode="0" endField="" fixedDuration="0" accumulate="0" durationUnit="min" startField="" endExpression="" enabled="0">
+      <temporal durationField="" fixedDuration="0" accumulate="0" endField="" startField="" enabled="0" startExpression="" endExpression="" durationUnit="min" mode="0" limitMode="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" zscale="1" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" binding="Centroid" type="IndividualFeatures" symbology="Line" extrusion="0" zoffset="0">
+      <elevation extrusionEnabled="0" symbology="Line" type="IndividualFeatures" zscale="1" clamping="Terrain" showMarkerSymbolInSurfacePlots="0" zoffset="0" extrusion="0" respectLayerSymbol="1" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="213,180,60,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="213,180,60,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -13516,36 +13518,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="213,180,60,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="152,129,43,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="213,180,60,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="152,129,43,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="213,180,60,255"/>
@@ -13560,44 +13562,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="213,180,60,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="152,129,43,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="213,180,60,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="diamond" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="152,129,43,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="3" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -13620,38 +13622,38 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" type="singleSymbol" symbollevels="0" referencescale="-1" enableorderby="0">
+      <renderer-v2 enableorderby="0" type="singleSymbol" symbollevels="0" referencescale="-1" forceraster="0">
         <symbols>
-          <symbol is_animated="0" type="fill" name="0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="26,0,201,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                <Option value="dot" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="b_diagonal" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="26,0,201,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                <Option type="QString" value="dot" name="outline_style"/>
+                <Option type="QString" value="0.26" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="b_diagonal" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="26,0,201,255"/>
@@ -13666,9 +13668,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="b_diagonal"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -13679,20 +13681,20 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="copy" name="QFieldSync/action"/>
+          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
           <Option type="List" name="dualview/previewExpressions">
-            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
           </Option>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="QString" value="0" name="embeddedWidgets/count"/>
           <Option type="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -13700,48 +13702,48 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory penAlpha="255" width="15" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" minimumSize="0" enabled="0" maxScaleDenominator="1e+08" diagramOrientation="Up" opacity="1" scaleBasedVisibility="0" spacingUnit="MM" minScaleDenominator="100000" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" lineSizeType="MM" penWidth="0" backgroundAlpha="255" scaleDependency="Area" spacing="0" direction="1" barWidth="5" sizeType="MM" height="15" penColor="#000000" showAxis="0">
-          <fontProperties bold="0" style="" italic="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0"/>
-          <attribute label="" colorOpacity="1" field="" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory height="15" scaleDependency="Area" width="15" lineSizeScale="3x:0,0,0,0,0,0" spacingUnit="MM" lineSizeType="MM" penColor="#000000" spacing="0" labelPlacementMethod="XHeight" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" backgroundAlpha="255" maxScaleDenominator="1e+08" barWidth="5" penWidth="0" minimumSize="0" penAlpha="255" minScaleDenominator="100000" sizeType="MM" backgroundColor="#ffffff" enabled="0" opacity="1" direction="1" scaleBasedVisibility="0" showAxis="0" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270">
+          <fontProperties style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0" strikethrough="0" italic="0" underline="0" bold="0"/>
+          <attribute color="#000000" field="" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="35,35,35,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0.26" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -13772,9 +13774,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -13782,34 +13784,34 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="2" showAll="1" placement="0" zIndex="0" dist="0" priority="0" obstacle="0">
+      <DiagramLayerSettings priority="0" linePlacementFlags="2" obstacle="0" dist="0" zIndex="0" placement="0" showAll="1">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option type="Map" name="properties">
               <Option type="Map" name="show">
-                <Option value="true" type="bool" name="active"/>
-                <Option value="id" type="QString" name="field"/>
-                <Option value="2" type="int" name="type"/>
+                <Option type="bool" value="true" name="active"/>
+                <Option type="QString" value="id" name="field"/>
+                <Option type="int" value="2" name="type"/>
               </Option>
             </Option>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field configurationFlags="None" name="id">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -13818,8 +13820,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -13828,8 +13830,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -13843,40 +13845,40 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
-        <alias index="1" name="" field="type"/>
-        <alias index="2" name="" field="page"/>
-        <alias index="3" name="" field="day"/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="type" name=""/>
+        <alias index="2" field="page" name=""/>
+        <alias index="3" field="day" name=""/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="type"/>
-        <default applyOnUpdate="0" expression="" field="page"/>
-        <default applyOnUpdate="0" expression="" field="day"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="type" expression=""/>
+        <default applyOnUpdate="0" field="page" expression=""/>
+        <default applyOnUpdate="0" field="day" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="id" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="type" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="page" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="day" constraints="0"/>
+        <constraint exp_strength="0" field="id" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="type" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="page" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="day" notnull_strength="0" constraints="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" desc="" field="id"/>
-        <constraint exp="" desc="" field="type"/>
-        <constraint exp="" desc="" field="page"/>
-        <constraint exp="" desc="" field="day"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="type" desc=""/>
+        <constraint exp="" field="page" desc=""/>
+        <constraint exp="" field="day" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="&quot;page&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="&quot;page&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
           <column width="-1" type="actions" hidden="1"/>
-          <column width="-1" type="field" name="id" hidden="0"/>
-          <column width="-1" type="field" name="type" hidden="0"/>
-          <column width="-1" type="field" name="day" hidden="0"/>
-          <column width="-1" type="field" name="page" hidden="0"/>
+          <column width="-1" type="field" hidden="0" name="id"/>
+          <column width="-1" type="field" hidden="0" name="type"/>
+          <column width="-1" type="field" hidden="0" name="day"/>
+          <column width="-1" type="field" hidden="0" name="page"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -13908,14 +13910,14 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="id" editable="1"/>
-        <field name="page" editable="1"/>
-        <field name="type" editable="1"/>
+        <field editable="1" name="id"/>
+        <field editable="1" name="page"/>
+        <field editable="1" name="type"/>
       </editable>
       <labelOnTop>
-        <field name="id" labelOnTop="0"/>
-        <field name="page" labelOnTop="0"/>
-        <field name="type" labelOnTop="0"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="page"/>
+        <field labelOnTop="0" name="type"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -13923,7 +13925,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" simplifyLocal="1" autoRefreshTime="0" wkbType="Point" simplifyDrawingHints="0" type="vector" symbologyReferenceScale="-1" minScale="100000000" legendPlaceholderImage="" refreshOnNotifyEnabled="0" labelsEnabled="1" maxScale="100000" styleCategories="AllStyleCategories" simplifyAlgorithm="0" refreshOnNotifyMessage="" readOnly="0" geometry="Point" autoRefreshEnabled="0" simplifyDrawingTol="1">
+    <maplayer simplifyLocal="1" simplifyDrawingHints="0" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1" legendPlaceholderImage="" symbologyReferenceScale="-1" readOnly="0" refreshOnNotifyEnabled="0" minScale="100000000" maxScale="100000" type="vector" autoRefreshTime="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="1" styleCategories="AllStyleCategories" geometry="Point" autoRefreshEnabled="0" wkbType="Point">
       <extent>
         <xmin>18.37523075794307204</xmin>
         <ymin>-33.95575166047164828</ymin>
@@ -13988,7 +13990,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxy="0" minz="0" dimensions="2" maxx="0" maxz="0" miny="0" minx="0" crs=""/>
+          <spatial maxz="0" minx="0" maxx="0" minz="0" crs="" miny="0" maxy="0" dimensions="2"/>
           <temporal>
             <period>
               <start></start>
@@ -13999,7 +14001,7 @@ def my_form_open(dialog, layer, feature):
       </resourceMetadata>
       <provider encoding="UTF-8">ogr</provider>
       <vectorjoins>
-        <join targetFieldName="position" joinLayerId="marshals_by_position20161003112326575" joinFieldName="position" cascadedDelete="0" memoryCache="0" dynamicForm="0" editable="0" hasCustomPrefix="1" upsertOnEdit="0" customPrefix="csv_">
+        <join joinFieldName="position" targetFieldName="position" cascadedDelete="0" hasCustomPrefix="1" customPrefix="csv_" joinLayerId="marshals_by_position20161003112326575" dynamicForm="0" upsertOnEdit="0" memoryCache="0" editable="0">
           <joinFieldsSubset>
             <field name="position"/>
             <field name="club"/>
@@ -14026,58 +14028,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="id" startExpression="" mode="0" limitMode="0" endField="" fixedDuration="0" accumulate="0" durationUnit="min" startField="" endExpression="" enabled="0">
+      <temporal durationField="id" fixedDuration="0" accumulate="0" endField="" startField="" enabled="0" startExpression="" endExpression="" durationUnit="min" mode="0" limitMode="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" zscale="1" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" binding="Centroid" type="IndividualFeatures" symbology="Line" extrusion="0" zoffset="0">
+      <elevation extrusionEnabled="0" symbology="Line" type="IndividualFeatures" zscale="1" clamping="Terrain" showMarkerSymbolInSurfacePlots="0" zoffset="0" extrusion="0" respectLayerSymbol="1" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="114,155,111,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="114,155,111,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -14108,36 +14110,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="114,155,111,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="81,111,79,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="114,155,111,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="81,111,79,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="114,155,111,255"/>
@@ -14152,44 +14154,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="114,155,111,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="81,111,79,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="114,155,111,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="diamond" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="81,111,79,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="3" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -14212,51 +14214,51 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" type="RuleRenderer" symbollevels="0" referencescale="-1" enableorderby="0">
+      <renderer-v2 enableorderby="0" type="RuleRenderer" symbollevels="0" referencescale="-1" forceraster="0">
         <rules key="{436a5e05-3485-477a-80b7-cf4d12d6dcec}">
-          <rule filter="'marshal plan' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" description="Show in marshal overview" symbol="0" label="Show by day in marshal plan" key="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
-          <rule filter="'marshal plan' = attribute( @atlas_feature , 'type' )" symbol="1" label="Always show in marshal plan" key="{308d81eb-cefa-4627-8afb-3baa8363f863}"/>
-          <rule filter="'marshal' = attribute( @atlas_feature , 'type' ) 'marshal plan' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;csv_days&quot; )" description="Show in marshal overview" symbol="2" label="Show in marshal maps" checkstate="0" key="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}"/>
+          <rule description="Show in marshal overview" symbol="0" label="Show by day in marshal plan" key="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}" filter="'marshal plan' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )"/>
+          <rule symbol="1" label="Always show in marshal plan" key="{308d81eb-cefa-4627-8afb-3baa8363f863}" filter="'marshal plan' = attribute( @atlas_feature , 'type' )"/>
+          <rule description="Show in marshal overview" symbol="2" label="Show in marshal maps" key="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}" filter="'marshal' = attribute( @atlas_feature , 'type' ) 'marshal plan' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;csv_days&quot; )" checkstate="0"/>
         </rules>
         <symbols>
-          <symbol is_animated="0" type="marker" name="0" clip_to_extent="1" alpha="0.8" force_rhr="0" frame_rate="10">
+          <symbol alpha="0.8" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="1" class="SimpleMarker" enabled="1">
+            <layer locked="0" class="SimpleMarker" enabled="1" pass="1">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="255,255,255,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="circle" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="5" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="Pixel" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="255,255,255,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="circle" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="5" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="Pixel" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -14279,42 +14281,42 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" type="marker" name="1" clip_to_extent="1" alpha="0.8" force_rhr="0" frame_rate="10">
+          <symbol alpha="0.8" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="1" class="SimpleMarker" enabled="1">
+            <layer locked="0" class="SimpleMarker" enabled="1" pass="1">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="255,255,255,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="circle" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="5" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="Pixel" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="255,255,255,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="circle" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="5" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="Pixel" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -14337,42 +14339,42 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" type="marker" name="2" clip_to_extent="1" alpha="0.01" force_rhr="0" frame_rate="10">
+          <symbol alpha="0.01" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="2">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="1" class="SimpleMarker" enabled="1">
+            <layer locked="0" class="SimpleMarker" enabled="1" pass="1">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="0,0,0,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="circle" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="0.1" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="0,0,0,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="circle" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="0.1" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -14395,9 +14397,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -14406,42 +14408,42 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="rule-based">
         <rules key="{a69c392f-7c45-4a75-a992-731572d96e04}">
-          <rule active="0" filter="regexp_match( attribute( @atlas_feature , 'type' ), 'marshal plan') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" description="Show by day in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)" key="{500cb2dd-2062-4b02-bba6-05c13c814f8b}">
+          <rule description="Show by day in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)" active="0" key="{500cb2dd-2062-4b02-bba6-05c13c814f8b}" filter="regexp_match( attribute( @atlas_feature , 'type' ), 'marshal plan') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )">
             <settings calloutType="simple">
-              <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="63" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="0.90000000000000002" fieldName="position" useSubstitutions="0" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="6" namedStyle="Semibold" forcedItalic="0" isExpression="0" fontSizeUnit="Point" allowHtml="0" legendString="Aa">
+              <text-style textOpacity="0.90000000000000002" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="Semibold" fontUnderline="0" fieldName="position" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" useSubstitutions="0" fontWeight="63" fontStrikeout="0" fontItalic="0" fontSize="6" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" isExpression="0" legendString="Aa" textOrientation="horizontal">
                 <families/>
-                <text-buffer bufferNoFill="0" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="0"/>
-                <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeDraw="1" shapeBorderWidth="0.10000000000000001" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0" shapeType="3" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="0,0,0,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="0.5" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-                  <symbol is_animated="0" type="marker" name="markerSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+                <text-buffer bufferNoFill="0" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+                <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskType="0"/>
+                <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="0,0,0,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="1" shapeType="3" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0.10000000000000001" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="0.5" shapeSizeY="0" shapeRadiiX="0">
+                  <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="markerSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                    <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
                       <Option type="Map">
-                        <Option value="0" type="QString" name="angle"/>
-                        <Option value="square" type="QString" name="cap_style"/>
-                        <Option value="231,113,72,255" type="QString" name="color"/>
-                        <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="circle" type="QString" name="name"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="diameter" type="QString" name="scale_method"/>
-                        <Option value="2" type="QString" name="size"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="size_unit"/>
-                        <Option value="1" type="QString" name="vertical_anchor_point"/>
+                        <Option type="QString" value="0" name="angle"/>
+                        <Option type="QString" value="square" name="cap_style"/>
+                        <Option type="QString" value="231,113,72,255" name="color"/>
+                        <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="circle" name="name"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="diameter" name="scale_method"/>
+                        <Option type="QString" value="2" name="size"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="size_unit"/>
+                        <Option type="QString" value="1" name="vertical_anchor_point"/>
                       </Option>
                       <prop k="angle" v="0"/>
                       <prop k="cap_style" v="square"/>
@@ -14464,34 +14466,34 @@ def my_form_open(dialog, layer, feature):
                       <prop k="vertical_anchor_point" v="1"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+                  <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="255,255,255,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0.1" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="255,255,255,255" name="color"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0.1" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="255,255,255,255"/>
@@ -14506,118 +14508,118 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option value="false" type="bool" name="active"/>
-                              <Option value="1" type="int" name="type"/>
-                              <Option value="" type="QString" name="val"/>
+                              <Option type="bool" value="false" name="active"/>
+                              <Option type="int" value="1" name="type"/>
+                              <Option type="QString" value="" name="val"/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format useMaxLineLengthForAutoWrap="1" leftDirectionSymbol="&lt;" wrapChar="" multilineAlign="0" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" decimals="3" rightDirectionSymbol=">" formatNumbers="0"/>
-              <placement overlapHandling="AllowOverlapIfRequired" lineAnchorType="0" centroidInside="0" overrunDistance="0" centroidWhole="0" geometryGeneratorEnabled="0" rotationAngle="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" geometryGeneratorType="PointGeometry" quadOffset="4" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="6" xOffset="0" allowDegraded="1" lineAnchorTextPoint="CenterOfText" layerType="PointGeometry" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" maxCurvedCharAngleOut="-20" repeatDistance="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" dist="1" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" distUnits="MM" lineAnchorClipping="0" placementFlags="10" priority="10" overrunDistanceUnit="MM" maxCurvedCharAngleIn="20" geometryGenerator="" lineAnchorPercent="0.5" yOffset="0" rotationUnit="AngleDegrees"/>
-              <rendering fontMaxPixelSize="10000" drawLabels="1" mergeLines="0" zIndex="2" upsidedownLabels="0" obstacleFactor="1" scaleVisibility="0" limitNumLabels="0" obstacleType="0" fontLimitPixelSize="0" maxNumLabels="2000" minFeatureSize="0" fontMinPixelSize="3" labelPerPart="0" obstacle="0" scaleMax="10000000" scaleMin="1" unplacedVisibility="0"/>
+              <text-format wrapChar="" rightDirectionSymbol=">" plussign="0" leftDirectionSymbol="&lt;" formatNumbers="0" decimals="3" multilineAlign="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
+              <placement offsetUnits="MapUnit" xOffset="0" maxCurvedCharAngleOut="-20" layerType="PointGeometry" allowDegraded="1" yOffset="0" overlapHandling="AllowOverlapIfRequired" geometryGeneratorType="PointGeometry" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" repeatDistanceUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" quadOffset="4" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidWhole="0" overrunDistance="0" overrunDistanceUnit="MM" centroidInside="0" placement="6" geometryGenerator="" priority="10" distUnits="MM" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" dist="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorTextPoint="CenterOfText" polygonPlacementFlags="2" rotationUnit="AngleDegrees" offsetType="0" placementFlags="10" repeatDistance="0"/>
+              <rendering limitNumLabels="0" obstacleType="0" obstacle="0" scaleMax="10000000" maxNumLabels="2000" labelPerPart="0" scaleMin="1" upsidedownLabels="0" zIndex="2" unplacedVisibility="0" fontLimitPixelSize="0" minFeatureSize="0" fontMaxPixelSize="10000" scaleVisibility="0" fontMinPixelSize="3" drawLabels="1" mergeLines="0" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="FontStyle">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="ShapeFillColor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="Size">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+                  <Option type="int" value="0" name="blendMode"/>
                   <Option type="Map" name="ddProperties">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
-                  <Option value="false" type="bool" name="drawToAllParts"/>
-                  <Option value="0" type="QString" name="enabled"/>
-                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                  <Option value="&lt;symbol is_animated=&quot;0&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                  <Option value="0" type="double" name="minLength"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                  <Option value="MM" type="QString" name="minLengthUnit"/>
-                  <Option value="0" type="double" name="offsetFromAnchor"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                  <Option value="0" type="double" name="offsetFromLabel"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                  <Option type="bool" value="false" name="drawToAllParts"/>
+                  <Option type="QString" value="0" name="enabled"/>
+                  <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
+                  <Option type="QString" value="&lt;symbol alpha=&quot;1&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
+                  <Option type="double" value="0" name="minLength"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
+                  <Option type="QString" value="MM" name="minLengthUnit"/>
+                  <Option type="double" value="0" name="offsetFromAnchor"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
+                  <Option type="double" value="0" name="offsetFromLabel"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule filter="regexp_match( attribute( @atlas_feature , 'type' ), 'marshal plan')" description="Always show in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)" key="{5dfe0a99-46ed-4158-aef2-a8ead8841c13}">
+          <rule description="Always show in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)" key="{5dfe0a99-46ed-4158-aef2-a8ead8841c13}" filter="regexp_match( attribute( @atlas_feature , 'type' ), 'marshal plan')">
             <settings calloutType="simple">
-              <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="63" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="0.90000000000000002" fieldName="position" useSubstitutions="0" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="6" namedStyle="Semibold" forcedItalic="0" isExpression="0" fontSizeUnit="Point" allowHtml="0" legendString="Aa">
+              <text-style textOpacity="0.90000000000000002" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="Semibold" fontUnderline="0" fieldName="position" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" useSubstitutions="0" fontWeight="63" fontStrikeout="0" fontItalic="0" fontSize="6" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" isExpression="0" legendString="Aa" textOrientation="horizontal">
                 <families/>
-                <text-buffer bufferNoFill="0" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="0"/>
-                <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeDraw="1" shapeBorderWidth="0.10000000000000001" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0" shapeType="3" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="0,0,0,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="0.5" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-                  <symbol is_animated="0" type="marker" name="markerSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+                <text-buffer bufferNoFill="0" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+                <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskType="0"/>
+                <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="0,0,0,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="1" shapeType="3" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0.10000000000000001" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="0.5" shapeSizeY="0" shapeRadiiX="0">
+                  <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="markerSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                    <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
                       <Option type="Map">
-                        <Option value="0" type="QString" name="angle"/>
-                        <Option value="square" type="QString" name="cap_style"/>
-                        <Option value="231,113,72,255" type="QString" name="color"/>
-                        <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="circle" type="QString" name="name"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="diameter" type="QString" name="scale_method"/>
-                        <Option value="2" type="QString" name="size"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="size_unit"/>
-                        <Option value="1" type="QString" name="vertical_anchor_point"/>
+                        <Option type="QString" value="0" name="angle"/>
+                        <Option type="QString" value="square" name="cap_style"/>
+                        <Option type="QString" value="231,113,72,255" name="color"/>
+                        <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="circle" name="name"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="diameter" name="scale_method"/>
+                        <Option type="QString" value="2" name="size"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="size_unit"/>
+                        <Option type="QString" value="1" name="vertical_anchor_point"/>
                       </Option>
                       <prop k="angle" v="0"/>
                       <prop k="cap_style" v="square"/>
@@ -14640,34 +14642,34 @@ def my_form_open(dialog, layer, feature):
                       <prop k="vertical_anchor_point" v="1"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+                  <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="255,255,255,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0.1" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="255,255,255,255" name="color"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0.1" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="255,255,255,255"/>
@@ -14682,110 +14684,110 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option value="false" type="bool" name="active"/>
-                              <Option value="1" type="int" name="type"/>
-                              <Option value="" type="QString" name="val"/>
+                              <Option type="bool" value="false" name="active"/>
+                              <Option type="int" value="1" name="type"/>
+                              <Option type="QString" value="" name="val"/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format useMaxLineLengthForAutoWrap="1" leftDirectionSymbol="&lt;" wrapChar="" multilineAlign="0" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" decimals="3" rightDirectionSymbol=">" formatNumbers="0"/>
-              <placement overlapHandling="AllowOverlapIfRequired" lineAnchorType="0" centroidInside="0" overrunDistance="0" centroidWhole="0" geometryGeneratorEnabled="0" rotationAngle="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" geometryGeneratorType="PointGeometry" quadOffset="4" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="6" xOffset="0" allowDegraded="1" lineAnchorTextPoint="CenterOfText" layerType="PointGeometry" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" maxCurvedCharAngleOut="-20" repeatDistance="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" dist="1" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" distUnits="MM" lineAnchorClipping="0" placementFlags="10" priority="10" overrunDistanceUnit="MM" maxCurvedCharAngleIn="20" geometryGenerator="" lineAnchorPercent="0.5" yOffset="0" rotationUnit="AngleDegrees"/>
-              <rendering fontMaxPixelSize="10000" drawLabels="1" mergeLines="0" zIndex="2" upsidedownLabels="0" obstacleFactor="1" scaleVisibility="0" limitNumLabels="0" obstacleType="0" fontLimitPixelSize="0" maxNumLabels="2000" minFeatureSize="0" fontMinPixelSize="3" labelPerPart="0" obstacle="0" scaleMax="10000000" scaleMin="1" unplacedVisibility="0"/>
+              <text-format wrapChar="" rightDirectionSymbol=">" plussign="0" leftDirectionSymbol="&lt;" formatNumbers="0" decimals="3" multilineAlign="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
+              <placement offsetUnits="MapUnit" xOffset="0" maxCurvedCharAngleOut="-20" layerType="PointGeometry" allowDegraded="1" yOffset="0" overlapHandling="AllowOverlapIfRequired" geometryGeneratorType="PointGeometry" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" repeatDistanceUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" quadOffset="4" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidWhole="0" overrunDistance="0" overrunDistanceUnit="MM" centroidInside="0" placement="6" geometryGenerator="" priority="10" distUnits="MM" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" dist="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorTextPoint="CenterOfText" polygonPlacementFlags="2" rotationUnit="AngleDegrees" offsetType="0" placementFlags="10" repeatDistance="0"/>
+              <rendering limitNumLabels="0" obstacleType="0" obstacle="0" scaleMax="10000000" maxNumLabels="2000" labelPerPart="0" scaleMin="1" upsidedownLabels="0" zIndex="2" unplacedVisibility="0" fontLimitPixelSize="0" minFeatureSize="0" fontMaxPixelSize="10000" scaleVisibility="0" fontMinPixelSize="3" drawLabels="1" mergeLines="0" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="FontStyle">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="ShapeFillColor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="Size">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+                  <Option type="int" value="0" name="blendMode"/>
                   <Option type="Map" name="ddProperties">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
-                  <Option value="false" type="bool" name="drawToAllParts"/>
-                  <Option value="0" type="QString" name="enabled"/>
-                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                  <Option value="&lt;symbol is_animated=&quot;0&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                  <Option value="0" type="double" name="minLength"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                  <Option value="MM" type="QString" name="minLengthUnit"/>
-                  <Option value="0" type="double" name="offsetFromAnchor"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                  <Option value="0" type="double" name="offsetFromLabel"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                  <Option type="bool" value="false" name="drawToAllParts"/>
+                  <Option type="QString" value="0" name="enabled"/>
+                  <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
+                  <Option type="QString" value="&lt;symbol alpha=&quot;1&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
+                  <Option type="double" value="0" name="minLength"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
+                  <Option type="QString" value="MM" name="minLengthUnit"/>
+                  <Option type="double" value="0" name="offsetFromAnchor"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
+                  <Option type="double" value="0" name="offsetFromLabel"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule active="0" filter="'marshal' = attribute( @atlas_feature , 'type' )" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - disabled due to broken z-index" key="{a55220d0-6cca-4356-8b73-4d8675ee164b}">
+          <rule description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - disabled due to broken z-index" active="0" key="{a55220d0-6cca-4356-8b73-4d8675ee164b}" filter="'marshal' = attribute( @atlas_feature , 'type' )">
             <settings calloutType="simple">
-              <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="63" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="0.5" fieldName="position" useSubstitutions="0" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="6" namedStyle="Semibold" forcedItalic="0" isExpression="0" fontSizeUnit="Point" allowHtml="0" legendString="Aa">
+              <text-style textOpacity="0.5" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="Semibold" fontUnderline="0" fieldName="position" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" useSubstitutions="0" fontWeight="63" fontStrikeout="0" fontItalic="0" fontSize="6" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" isExpression="0" legendString="Aa" textOrientation="horizontal">
                 <families/>
-                <text-buffer bufferNoFill="0" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="0"/>
-                <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0.20000000000000001" shapeFillColor="255,255,255,255" shapeDraw="1" shapeBorderWidth="0.40000000000000002" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0.20000000000000001" shapeType="3" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="0,0,0,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="0.5" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-                  <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+                <text-buffer bufferNoFill="0" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+                <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskType="0"/>
+                <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="0,0,0,255" shapeRotationType="0" shapeSizeX="0.20000000000000001" shapeDraw="1" shapeType="3" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0.40000000000000002" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="0.5" shapeSizeY="0.20000000000000001" shapeRadiiX="0">
+                  <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="255,255,255,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0.4" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="255,255,255,255" name="color"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0.4" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="255,255,255,255"/>
@@ -14800,181 +14802,181 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option value="true" type="bool" name="active"/>
-                              <Option value="if ( @atlas_featureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" type="QString" name="expression"/>
-                              <Option value="3" type="int" name="type"/>
+                              <Option type="bool" value="true" name="active"/>
+                              <Option type="QString" value="if ( @atlas_featureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" name="expression"/>
+                              <Option type="int" value="3" name="type"/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option type="Map" name="properties">
                       <Option type="Map" name="AlwaysShow">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="if ( @atlasfeature_id = $id, 1, 0)" type="QString" name="expression"/>
-                        <Option value="3" type="int" name="type"/>
+                        <Option type="bool" value="true" name="active"/>
+                        <Option type="QString" value="if ( @atlasfeature_id = $id, 1, 0)" name="expression"/>
+                        <Option type="int" value="3" name="type"/>
                       </Option>
                       <Option type="Map" name="FontOpacity">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="100 - (if ( @atlas_featureid = $id, 10, 40))" type="QString" name="expression"/>
-                        <Option value="3" type="int" name="type"/>
+                        <Option type="bool" value="true" name="active"/>
+                        <Option type="QString" value="100 - (if ( @atlas_featureid = $id, 10, 40))" name="expression"/>
+                        <Option type="int" value="3" name="type"/>
                       </Option>
                       <Option type="Map" name="FontStyle">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="if ( @atlas_featureid = $id, 'Semibold', 'Regular' )" type="QString" name="expression"/>
-                        <Option value="3" type="int" name="type"/>
+                        <Option type="bool" value="true" name="active"/>
+                        <Option type="QString" value="if ( @atlas_featureid = $id, 'Semibold', 'Regular' )" name="expression"/>
+                        <Option type="int" value="3" name="type"/>
                       </Option>
                       <Option type="Map" name="ObstacleFactor">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
+                        <Option type="bool" value="false" name="active"/>
+                        <Option type="int" value="1" name="type"/>
+                        <Option type="QString" value="" name="val"/>
                       </Option>
                       <Option type="Map" name="Priority">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="if ( @atlas_featureid = $id, 10.0, 8.0 )" type="QString" name="expression"/>
-                        <Option value="3" type="int" name="type"/>
+                        <Option type="bool" value="true" name="active"/>
+                        <Option type="QString" value="if ( @atlas_featureid = $id, 10.0, 8.0 )" name="expression"/>
+                        <Option type="int" value="3" name="type"/>
                       </Option>
                       <Option type="Map" name="ShapeOpacity">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="100 - (if ( @atlas_featureid = $id, 10, 40))" type="QString" name="expression"/>
-                        <Option value="3" type="int" name="type"/>
+                        <Option type="bool" value="true" name="active"/>
+                        <Option type="QString" value="100 - (if ( @atlas_featureid = $id, 10, 40))" name="expression"/>
+                        <Option type="int" value="3" name="type"/>
                       </Option>
                       <Option type="Map" name="Size">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="if ( @atlas_featureid = $id, 8, 6 )" type="QString" name="expression"/>
-                        <Option value="3" type="int" name="type"/>
+                        <Option type="bool" value="true" name="active"/>
+                        <Option type="QString" value="if ( @atlas_featureid = $id, 8, 6 )" name="expression"/>
+                        <Option type="int" value="3" name="type"/>
                       </Option>
                       <Option type="Map" name="ZIndex">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="if ( @atlasfeature_id = $id, 15, 5 )" type="QString" name="expression"/>
-                        <Option value="3" type="int" name="type"/>
+                        <Option type="bool" value="true" name="active"/>
+                        <Option type="QString" value="if ( @atlasfeature_id = $id, 15, 5 )" name="expression"/>
+                        <Option type="int" value="3" name="type"/>
                       </Option>
                     </Option>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format useMaxLineLengthForAutoWrap="1" leftDirectionSymbol="&lt;" wrapChar="" multilineAlign="1" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" decimals="3" rightDirectionSymbol=">" formatNumbers="0"/>
-              <placement overlapHandling="AllowOverlapIfRequired" lineAnchorType="0" centroidInside="0" overrunDistance="0" centroidWhole="0" geometryGeneratorEnabled="0" rotationAngle="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" geometryGeneratorType="PointGeometry" quadOffset="4" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="6" xOffset="0" allowDegraded="1" lineAnchorTextPoint="CenterOfText" layerType="UnknownGeometry" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" maxCurvedCharAngleOut="-20" repeatDistance="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" dist="0" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" distUnits="MM" lineAnchorClipping="0" placementFlags="10" priority="8" overrunDistanceUnit="MM" maxCurvedCharAngleIn="20" geometryGenerator="" lineAnchorPercent="0.5" yOffset="0" rotationUnit="AngleDegrees"/>
-              <rendering fontMaxPixelSize="10000" drawLabels="1" mergeLines="0" zIndex="5" upsidedownLabels="0" obstacleFactor="1.8" scaleVisibility="0" limitNumLabels="0" obstacleType="0" fontLimitPixelSize="0" maxNumLabels="2000" minFeatureSize="0" fontMinPixelSize="3" labelPerPart="0" obstacle="0" scaleMax="10000000" scaleMin="1" unplacedVisibility="0"/>
+              <text-format wrapChar="" rightDirectionSymbol=">" plussign="0" leftDirectionSymbol="&lt;" formatNumbers="0" decimals="3" multilineAlign="1" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
+              <placement offsetUnits="MapUnit" xOffset="0" maxCurvedCharAngleOut="-20" layerType="UnknownGeometry" allowDegraded="1" yOffset="0" overlapHandling="AllowOverlapIfRequired" geometryGeneratorType="PointGeometry" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" repeatDistanceUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" quadOffset="4" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidWhole="0" overrunDistance="0" overrunDistanceUnit="MM" centroidInside="0" placement="6" geometryGenerator="" priority="8" distUnits="MM" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" dist="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorTextPoint="CenterOfText" polygonPlacementFlags="2" rotationUnit="AngleDegrees" offsetType="0" placementFlags="10" repeatDistance="0"/>
+              <rendering limitNumLabels="0" obstacleType="0" obstacle="0" scaleMax="10000000" maxNumLabels="2000" labelPerPart="0" scaleMin="1" upsidedownLabels="0" zIndex="5" unplacedVisibility="0" fontLimitPixelSize="0" minFeatureSize="0" fontMaxPixelSize="10000" scaleVisibility="0" fontMinPixelSize="3" drawLabels="1" mergeLines="0" obstacleFactor="1.8"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="AlwaysShow">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if ( @atlasfeature_id = $id, 1, 0)" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if ( @atlasfeature_id = $id, 1, 0)" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="FontOpacity">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="100 - (if ( @atlas_featureid = $id, 10, 40))" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="100 - (if ( @atlas_featureid = $id, 10, 40))" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="FontStyle">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if ( @atlas_featureid = $id, 'Semibold', 'Regular' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if ( @atlas_featureid = $id, 'Semibold', 'Regular' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="ObstacleFactor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="Priority">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if ( @atlas_featureid = $id, 10.0, 8.0 )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if ( @atlas_featureid = $id, 10.0, 8.0 )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="ShapeFillColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if ( @atlas_featureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if ( @atlas_featureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="ShapeOpacity">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="100 - (if ( @atlas_featureid = $id, 10, 40))" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="100 - (if ( @atlas_featureid = $id, 10, 40))" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="Size">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if ( @atlas_featureid = $id, 8, 6 )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if ( @atlas_featureid = $id, 8, 6 )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="ZIndex">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if ( @atlasfeature_id = $id, 15, 5 )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if ( @atlasfeature_id = $id, 15, 5 )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+                  <Option type="int" value="0" name="blendMode"/>
                   <Option type="Map" name="ddProperties">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
-                  <Option value="false" type="bool" name="drawToAllParts"/>
-                  <Option value="0" type="QString" name="enabled"/>
-                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                  <Option value="&lt;symbol is_animated=&quot;0&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                  <Option value="0" type="double" name="minLength"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                  <Option value="MM" type="QString" name="minLengthUnit"/>
-                  <Option value="0" type="double" name="offsetFromAnchor"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                  <Option value="0" type="double" name="offsetFromLabel"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                  <Option type="bool" value="false" name="drawToAllParts"/>
+                  <Option type="QString" value="0" name="enabled"/>
+                  <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
+                  <Option type="QString" value="&lt;symbol alpha=&quot;1&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
+                  <Option type="double" value="0" name="minLength"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
+                  <Option type="QString" value="MM" name="minLengthUnit"/>
+                  <Option type="double" value="0" name="offsetFromAnchor"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
+                  <Option type="double" value="0" name="offsetFromLabel"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule active="0" filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid != $id" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show inactive labels below active label" key="{174a53de-c4da-41e6-abf7-f69d60b2cff6}">
+          <rule description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show inactive labels below active label" active="0" key="{174a53de-c4da-41e6-abf7-f69d60b2cff6}" filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid != $id">
             <settings calloutType="simple">
-              <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="50" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="0.59999999999999998" fieldName="position" useSubstitutions="0" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="6" namedStyle="Regular" forcedItalic="0" isExpression="0" fontSizeUnit="Point" allowHtml="0" legendString="Aa">
+              <text-style textOpacity="0.59999999999999998" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="Regular" fontUnderline="0" fieldName="position" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" useSubstitutions="0" fontWeight="50" fontStrikeout="0" fontItalic="0" fontSize="6" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" isExpression="0" legendString="Aa" textOrientation="horizontal">
                 <families/>
-                <text-buffer bufferNoFill="0" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="0"/>
-                <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0.20000000000000001" shapeFillColor="255,255,255,255" shapeDraw="1" shapeBorderWidth="0.40000000000000002" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0.20000000000000001" shapeType="3" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="0,0,0,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="0.59999999999999998" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-                  <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+                <text-buffer bufferNoFill="0" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+                <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskType="0"/>
+                <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="0,0,0,255" shapeRotationType="0" shapeSizeX="0.20000000000000001" shapeDraw="1" shapeType="3" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0.40000000000000002" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="0.59999999999999998" shapeSizeY="0.20000000000000001" shapeRadiiX="0">
+                  <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="255,255,255,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0.4" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="255,255,255,255" name="color"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0.4" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="255,255,255,255"/>
@@ -14989,181 +14991,181 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option value="false" type="bool" name="active"/>
-                              <Option value="1" type="int" name="type"/>
-                              <Option value="" type="QString" name="val"/>
+                              <Option type="bool" value="false" name="active"/>
+                              <Option type="int" value="1" name="type"/>
+                              <Option type="QString" value="" name="val"/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option type="Map" name="properties">
                       <Option type="Map" name="AlwaysShow">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
+                        <Option type="bool" value="false" name="active"/>
+                        <Option type="int" value="1" name="type"/>
+                        <Option type="QString" value="" name="val"/>
                       </Option>
                       <Option type="Map" name="FontOpacity">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
+                        <Option type="bool" value="false" name="active"/>
+                        <Option type="int" value="1" name="type"/>
+                        <Option type="QString" value="" name="val"/>
                       </Option>
                       <Option type="Map" name="FontStyle">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
+                        <Option type="bool" value="false" name="active"/>
+                        <Option type="int" value="1" name="type"/>
+                        <Option type="QString" value="" name="val"/>
                       </Option>
                       <Option type="Map" name="ObstacleFactor">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
+                        <Option type="bool" value="false" name="active"/>
+                        <Option type="int" value="1" name="type"/>
+                        <Option type="QString" value="" name="val"/>
                       </Option>
                       <Option type="Map" name="Priority">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
+                        <Option type="bool" value="false" name="active"/>
+                        <Option type="int" value="1" name="type"/>
+                        <Option type="QString" value="" name="val"/>
                       </Option>
                       <Option type="Map" name="ShapeOpacity">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
+                        <Option type="bool" value="false" name="active"/>
+                        <Option type="int" value="1" name="type"/>
+                        <Option type="QString" value="" name="val"/>
                       </Option>
                       <Option type="Map" name="Size">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
+                        <Option type="bool" value="false" name="active"/>
+                        <Option type="int" value="1" name="type"/>
+                        <Option type="QString" value="" name="val"/>
                       </Option>
                       <Option type="Map" name="ZIndex">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
+                        <Option type="bool" value="false" name="active"/>
+                        <Option type="int" value="1" name="type"/>
+                        <Option type="QString" value="" name="val"/>
                       </Option>
                     </Option>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format useMaxLineLengthForAutoWrap="1" leftDirectionSymbol="&lt;" wrapChar="" multilineAlign="1" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" decimals="3" rightDirectionSymbol=">" formatNumbers="0"/>
-              <placement overlapHandling="AllowOverlapIfRequired" lineAnchorType="0" centroidInside="0" overrunDistance="0" centroidWhole="0" geometryGeneratorEnabled="0" rotationAngle="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" geometryGeneratorType="PointGeometry" quadOffset="4" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="6" xOffset="0" allowDegraded="1" lineAnchorTextPoint="CenterOfText" layerType="UnknownGeometry" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" maxCurvedCharAngleOut="-20" repeatDistance="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" dist="0" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" distUnits="MM" lineAnchorClipping="0" placementFlags="10" priority="8" overrunDistanceUnit="MM" maxCurvedCharAngleIn="20" geometryGenerator="" lineAnchorPercent="0.5" yOffset="0" rotationUnit="AngleDegrees"/>
-              <rendering fontMaxPixelSize="10000" drawLabels="1" mergeLines="0" zIndex="5" upsidedownLabels="0" obstacleFactor="1.8" scaleVisibility="0" limitNumLabels="0" obstacleType="0" fontLimitPixelSize="0" maxNumLabels="2000" minFeatureSize="0" fontMinPixelSize="3" labelPerPart="0" obstacle="0" scaleMax="10000000" scaleMin="1" unplacedVisibility="0"/>
+              <text-format wrapChar="" rightDirectionSymbol=">" plussign="0" leftDirectionSymbol="&lt;" formatNumbers="0" decimals="3" multilineAlign="1" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
+              <placement offsetUnits="MapUnit" xOffset="0" maxCurvedCharAngleOut="-20" layerType="UnknownGeometry" allowDegraded="1" yOffset="0" overlapHandling="AllowOverlapIfRequired" geometryGeneratorType="PointGeometry" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" repeatDistanceUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" quadOffset="4" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidWhole="0" overrunDistance="0" overrunDistanceUnit="MM" centroidInside="0" placement="6" geometryGenerator="" priority="8" distUnits="MM" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" dist="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorTextPoint="CenterOfText" polygonPlacementFlags="2" rotationUnit="AngleDegrees" offsetType="0" placementFlags="10" repeatDistance="0"/>
+              <rendering limitNumLabels="0" obstacleType="0" obstacle="0" scaleMax="10000000" maxNumLabels="2000" labelPerPart="0" scaleMin="1" upsidedownLabels="0" zIndex="5" unplacedVisibility="0" fontLimitPixelSize="0" minFeatureSize="0" fontMaxPixelSize="10000" scaleVisibility="0" fontMinPixelSize="3" drawLabels="1" mergeLines="0" obstacleFactor="1.8"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="AlwaysShow">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="FontOpacity">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="FontStyle">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="ObstacleFactor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="Priority">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="ShapeFillColor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="ShapeOpacity">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="Size">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="ZIndex">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+                  <Option type="int" value="0" name="blendMode"/>
                   <Option type="Map" name="ddProperties">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
-                  <Option value="false" type="bool" name="drawToAllParts"/>
-                  <Option value="0" type="QString" name="enabled"/>
-                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                  <Option value="&lt;symbol is_animated=&quot;0&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                  <Option value="0" type="double" name="minLength"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                  <Option value="MM" type="QString" name="minLengthUnit"/>
-                  <Option value="0" type="double" name="offsetFromAnchor"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                  <Option value="0" type="double" name="offsetFromLabel"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                  <Option type="bool" value="false" name="drawToAllParts"/>
+                  <Option type="QString" value="0" name="enabled"/>
+                  <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
+                  <Option type="QString" value="&lt;symbol alpha=&quot;1&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
+                  <Option type="double" value="0" name="minLength"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
+                  <Option type="QString" value="MM" name="minLengthUnit"/>
+                  <Option type="double" value="0" name="offsetFromAnchor"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
+                  <Option type="double" value="0" name="offsetFromLabel"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule active="0" filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid = $id" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show active layer on top" key="{fc4fc81b-6cf7-433a-b5f5-defae9ee6eb9}">
+          <rule description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show active layer on top" active="0" key="{fc4fc81b-6cf7-433a-b5f5-defae9ee6eb9}" filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid = $id">
             <settings calloutType="simple">
-              <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="63" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="0.90000000000000002" fieldName="position" useSubstitutions="0" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="8" namedStyle="Semibold" forcedItalic="0" isExpression="0" fontSizeUnit="Point" allowHtml="0" legendString="Aa">
+              <text-style textOpacity="0.90000000000000002" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="Semibold" fontUnderline="0" fieldName="position" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" useSubstitutions="0" fontWeight="63" fontStrikeout="0" fontItalic="0" fontSize="8" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" isExpression="0" legendString="Aa" textOrientation="horizontal">
                 <families/>
-                <text-buffer bufferNoFill="0" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="0"/>
-                <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0.20000000000000001" shapeFillColor="255,255,0,255" shapeDraw="1" shapeBorderWidth="0.40000000000000002" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0.20000000000000001" shapeType="3" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="0,0,0,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="0.90000000000000002" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-                  <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+                <text-buffer bufferNoFill="0" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+                <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskType="0"/>
+                <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="0,0,0,255" shapeRotationType="0" shapeSizeX="0.20000000000000001" shapeDraw="1" shapeType="3" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0.40000000000000002" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,0,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="0.90000000000000002" shapeSizeY="0.20000000000000001" shapeRadiiX="0">
+                  <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="255,255,0,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0.4" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="255,255,0,255" name="color"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0.4" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="255,255,0,255"/>
@@ -15178,149 +15180,149 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option value="false" type="bool" name="active"/>
-                              <Option value="1" type="int" name="type"/>
-                              <Option value="" type="QString" name="val"/>
+                              <Option type="bool" value="false" name="active"/>
+                              <Option type="int" value="1" name="type"/>
+                              <Option type="QString" value="" name="val"/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option type="Map" name="properties">
                       <Option type="Map" name="AlwaysShow">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
+                        <Option type="bool" value="false" name="active"/>
+                        <Option type="int" value="1" name="type"/>
+                        <Option type="QString" value="" name="val"/>
                       </Option>
                       <Option type="Map" name="FontOpacity">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
+                        <Option type="bool" value="false" name="active"/>
+                        <Option type="int" value="1" name="type"/>
+                        <Option type="QString" value="" name="val"/>
                       </Option>
                       <Option type="Map" name="FontStyle">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
+                        <Option type="bool" value="false" name="active"/>
+                        <Option type="int" value="1" name="type"/>
+                        <Option type="QString" value="" name="val"/>
                       </Option>
                       <Option type="Map" name="ObstacleFactor">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
+                        <Option type="bool" value="false" name="active"/>
+                        <Option type="int" value="1" name="type"/>
+                        <Option type="QString" value="" name="val"/>
                       </Option>
                       <Option type="Map" name="Priority">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
+                        <Option type="bool" value="false" name="active"/>
+                        <Option type="int" value="1" name="type"/>
+                        <Option type="QString" value="" name="val"/>
                       </Option>
                       <Option type="Map" name="ShapeOpacity">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
+                        <Option type="bool" value="false" name="active"/>
+                        <Option type="int" value="1" name="type"/>
+                        <Option type="QString" value="" name="val"/>
                       </Option>
                       <Option type="Map" name="Size">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
+                        <Option type="bool" value="false" name="active"/>
+                        <Option type="int" value="1" name="type"/>
+                        <Option type="QString" value="" name="val"/>
                       </Option>
                       <Option type="Map" name="ZIndex">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
+                        <Option type="bool" value="false" name="active"/>
+                        <Option type="int" value="1" name="type"/>
+                        <Option type="QString" value="" name="val"/>
                       </Option>
                     </Option>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format useMaxLineLengthForAutoWrap="1" leftDirectionSymbol="&lt;" wrapChar="" multilineAlign="1" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" decimals="3" rightDirectionSymbol=">" formatNumbers="0"/>
-              <placement overlapHandling="AllowOverlapIfRequired" lineAnchorType="0" centroidInside="0" overrunDistance="0" centroidWhole="0" geometryGeneratorEnabled="0" rotationAngle="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" geometryGeneratorType="PointGeometry" quadOffset="4" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="0" xOffset="0" allowDegraded="1" lineAnchorTextPoint="CenterOfText" layerType="UnknownGeometry" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" maxCurvedCharAngleOut="-20" repeatDistance="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" dist="0" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" distUnits="MM" lineAnchorClipping="0" placementFlags="10" priority="10" overrunDistanceUnit="MM" maxCurvedCharAngleIn="20" geometryGenerator="" lineAnchorPercent="0.5" yOffset="0" rotationUnit="AngleDegrees"/>
-              <rendering fontMaxPixelSize="10000" drawLabels="1" mergeLines="0" zIndex="10" upsidedownLabels="0" obstacleFactor="1.8" scaleVisibility="0" limitNumLabels="0" obstacleType="0" fontLimitPixelSize="0" maxNumLabels="2000" minFeatureSize="0" fontMinPixelSize="3" labelPerPart="0" obstacle="0" scaleMax="10000000" scaleMin="1" unplacedVisibility="0"/>
+              <text-format wrapChar="" rightDirectionSymbol=">" plussign="0" leftDirectionSymbol="&lt;" formatNumbers="0" decimals="3" multilineAlign="1" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
+              <placement offsetUnits="MapUnit" xOffset="0" maxCurvedCharAngleOut="-20" layerType="UnknownGeometry" allowDegraded="1" yOffset="0" overlapHandling="AllowOverlapIfRequired" geometryGeneratorType="PointGeometry" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" repeatDistanceUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" quadOffset="4" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidWhole="0" overrunDistance="0" overrunDistanceUnit="MM" centroidInside="0" placement="0" geometryGenerator="" priority="10" distUnits="MM" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" dist="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorTextPoint="CenterOfText" polygonPlacementFlags="2" rotationUnit="AngleDegrees" offsetType="0" placementFlags="10" repeatDistance="0"/>
+              <rendering limitNumLabels="0" obstacleType="0" obstacle="0" scaleMax="10000000" maxNumLabels="2000" labelPerPart="0" scaleMin="1" upsidedownLabels="0" zIndex="10" unplacedVisibility="0" fontLimitPixelSize="0" minFeatureSize="0" fontMaxPixelSize="10000" scaleVisibility="0" fontMinPixelSize="3" drawLabels="1" mergeLines="0" obstacleFactor="1.8"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="AlwaysShow">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="FontOpacity">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="FontStyle">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="ObstacleFactor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="Priority">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="ShapeFillColor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="ShapeOpacity">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="Size">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="ZIndex">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+                  <Option type="int" value="0" name="blendMode"/>
                   <Option type="Map" name="ddProperties">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
-                  <Option value="false" type="bool" name="drawToAllParts"/>
-                  <Option value="0" type="QString" name="enabled"/>
-                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                  <Option value="&lt;symbol is_animated=&quot;0&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                  <Option value="0" type="double" name="minLength"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                  <Option value="MM" type="QString" name="minLengthUnit"/>
-                  <Option value="0" type="double" name="offsetFromAnchor"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                  <Option value="0" type="double" name="offsetFromLabel"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                  <Option type="bool" value="false" name="drawToAllParts"/>
+                  <Option type="QString" value="0" name="enabled"/>
+                  <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
+                  <Option type="QString" value="&lt;symbol alpha=&quot;1&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
+                  <Option type="double" value="0" name="minLength"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
+                  <Option type="QString" value="MM" name="minLengthUnit"/>
+                  <Option type="double" value="0" name="offsetFromAnchor"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
+                  <Option type="double" value="0" name="offsetFromLabel"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
@@ -15329,153 +15331,153 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="copy" name="QFieldSync/action"/>
+          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
           <Option type="List" name="dualview/previewExpressions">
-            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
           </Option>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
-          <Option value="false" type="QString" name="labeling/addDirectionSymbol"/>
-          <Option value="0" type="QString" name="labeling/angleOffset"/>
-          <Option value="0" type="QString" name="labeling/blendMode"/>
-          <Option value="0" type="QString" name="labeling/bufferBlendMode"/>
-          <Option value="255" type="QString" name="labeling/bufferColorA"/>
-          <Option value="255" type="QString" name="labeling/bufferColorB"/>
-          <Option value="255" type="QString" name="labeling/bufferColorG"/>
-          <Option value="255" type="QString" name="labeling/bufferColorR"/>
-          <Option value="false" type="QString" name="labeling/bufferDraw"/>
-          <Option value="64" type="QString" name="labeling/bufferJoinStyle"/>
-          <Option value="false" type="QString" name="labeling/bufferNoFill"/>
-          <Option value="1" type="QString" name="labeling/bufferSize"/>
-          <Option value="false" type="QString" name="labeling/bufferSizeInMapUnits"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/bufferSizeMapUnitScale"/>
-          <Option value="0" type="QString" name="labeling/bufferTransp"/>
-          <Option value="false" type="QString" name="labeling/centroidInside"/>
-          <Option value="false" type="QString" name="labeling/centroidWhole"/>
-          <Option value="3" type="QString" name="labeling/decimals"/>
-          <Option value="false" type="QString" name="labeling/displayAll"/>
-          <Option value="0" type="QString" name="labeling/dist"/>
-          <Option value="false" type="QString" name="labeling/distInMapUnits"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/distMapUnitScale"/>
-          <Option value="false" type="QString" name="labeling/drawLabels"/>
-          <Option value="false" type="QString" name="labeling/enabled"/>
-          <Option value="position" type="QString" name="labeling/fieldName"/>
-          <Option value="false" type="QString" name="labeling/fitInPolygonOnly"/>
-          <Option value="0" type="QString" name="labeling/fontCapitals"/>
-          <Option value="Myriad Pro" type="QString" name="labeling/fontFamily"/>
-          <Option value="false" type="QString" name="labeling/fontItalic"/>
-          <Option value="0" type="QString" name="labeling/fontLetterSpacing"/>
-          <Option value="false" type="QString" name="labeling/fontLimitPixelSize"/>
-          <Option value="10000" type="QString" name="labeling/fontMaxPixelSize"/>
-          <Option value="3" type="QString" name="labeling/fontMinPixelSize"/>
-          <Option value="10" type="QString" name="labeling/fontSize"/>
-          <Option value="false" type="QString" name="labeling/fontSizeInMapUnits"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/fontSizeMapUnitScale"/>
-          <Option value="false" type="QString" name="labeling/fontStrikeout"/>
-          <Option value="false" type="QString" name="labeling/fontUnderline"/>
-          <Option value="63" type="QString" name="labeling/fontWeight"/>
-          <Option value="0" type="QString" name="labeling/fontWordSpacing"/>
-          <Option value="false" type="QString" name="labeling/formatNumbers"/>
-          <Option value="false" type="QString" name="labeling/isExpression"/>
-          <Option value="true" type="QString" name="labeling/labelOffsetInMapUnits"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/labelOffsetMapUnitScale"/>
-          <Option value="false" type="QString" name="labeling/labelPerPart"/>
-          <Option value="&lt;" type="QString" name="labeling/leftDirectionSymbol"/>
-          <Option value="false" type="QString" name="labeling/limitNumLabels"/>
-          <Option value="20" type="QString" name="labeling/maxCurvedCharAngleIn"/>
-          <Option value="-20" type="QString" name="labeling/maxCurvedCharAngleOut"/>
-          <Option value="2000" type="QString" name="labeling/maxNumLabels"/>
-          <Option value="false" type="QString" name="labeling/mergeLines"/>
-          <Option value="0" type="QString" name="labeling/minFeatureSize"/>
-          <Option value="0" type="QString" name="labeling/multilineAlign"/>
-          <Option value="1" type="QString" name="labeling/multilineHeight"/>
-          <Option value="Semibold" type="QString" name="labeling/namedStyle"/>
-          <Option value="true" type="QString" name="labeling/obstacle"/>
-          <Option value="1" type="QString" name="labeling/obstacleFactor"/>
-          <Option value="0" type="QString" name="labeling/obstacleType"/>
-          <Option value="0" type="QString" name="labeling/offsetType"/>
-          <Option value="0" type="QString" name="labeling/placeDirectionSymbol"/>
-          <Option value="0" type="QString" name="labeling/placement"/>
-          <Option value="10" type="QString" name="labeling/placementFlags"/>
-          <Option value="false" type="QString" name="labeling/plussign"/>
-          <Option value="TR,TL,BR,BL,R,L,TSR,BSR" type="QString" name="labeling/predefinedPositionOrder"/>
-          <Option value="true" type="QString" name="labeling/preserveRotation"/>
-          <Option value="#ffffff" type="QString" name="labeling/previewBkgrdColor"/>
-          <Option value="5" type="QString" name="labeling/priority"/>
-          <Option value="4" type="QString" name="labeling/quadOffset"/>
-          <Option value="0" type="QString" name="labeling/repeatDistance"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/repeatDistanceMapUnitScale"/>
-          <Option value="1" type="QString" name="labeling/repeatDistanceUnit"/>
-          <Option value="false" type="QString" name="labeling/reverseDirectionSymbol"/>
-          <Option value=">" type="QString" name="labeling/rightDirectionSymbol"/>
-          <Option value="10000000" type="QString" name="labeling/scaleMax"/>
-          <Option value="1" type="QString" name="labeling/scaleMin"/>
-          <Option value="false" type="QString" name="labeling/scaleVisibility"/>
-          <Option value="6" type="QString" name="labeling/shadowBlendMode"/>
-          <Option value="0" type="QString" name="labeling/shadowColorB"/>
-          <Option value="0" type="QString" name="labeling/shadowColorG"/>
-          <Option value="0" type="QString" name="labeling/shadowColorR"/>
-          <Option value="false" type="QString" name="labeling/shadowDraw"/>
-          <Option value="135" type="QString" name="labeling/shadowOffsetAngle"/>
-          <Option value="1" type="QString" name="labeling/shadowOffsetDist"/>
-          <Option value="true" type="QString" name="labeling/shadowOffsetGlobal"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shadowOffsetMapUnitScale"/>
-          <Option value="1" type="QString" name="labeling/shadowOffsetUnits"/>
-          <Option value="1.5" type="QString" name="labeling/shadowRadius"/>
-          <Option value="false" type="QString" name="labeling/shadowRadiusAlphaOnly"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shadowRadiusMapUnitScale"/>
-          <Option value="1" type="QString" name="labeling/shadowRadiusUnits"/>
-          <Option value="100" type="QString" name="labeling/shadowScale"/>
-          <Option value="30" type="QString" name="labeling/shadowTransparency"/>
-          <Option value="0" type="QString" name="labeling/shadowUnder"/>
-          <Option value="0" type="QString" name="labeling/shapeBlendMode"/>
-          <Option value="255" type="QString" name="labeling/shapeBorderColorA"/>
-          <Option value="128" type="QString" name="labeling/shapeBorderColorB"/>
-          <Option value="128" type="QString" name="labeling/shapeBorderColorG"/>
-          <Option value="128" type="QString" name="labeling/shapeBorderColorR"/>
-          <Option value="0" type="QString" name="labeling/shapeBorderWidth"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shapeBorderWidthMapUnitScale"/>
-          <Option value="1" type="QString" name="labeling/shapeBorderWidthUnits"/>
-          <Option value="true" type="QString" name="labeling/shapeDraw"/>
-          <Option value="255" type="QString" name="labeling/shapeFillColorA"/>
-          <Option value="138" type="QString" name="labeling/shapeFillColorB"/>
-          <Option value="0" type="QString" name="labeling/shapeFillColorG"/>
-          <Option value="101" type="QString" name="labeling/shapeFillColorR"/>
-          <Option value="64" type="QString" name="labeling/shapeJoinStyle"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shapeOffsetMapUnitScale"/>
-          <Option value="1" type="QString" name="labeling/shapeOffsetUnits"/>
-          <Option value="0" type="QString" name="labeling/shapeOffsetX"/>
-          <Option value="0" type="QString" name="labeling/shapeOffsetY"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shapeRadiiMapUnitScale"/>
-          <Option value="1" type="QString" name="labeling/shapeRadiiUnits"/>
-          <Option value="0" type="QString" name="labeling/shapeRadiiX"/>
-          <Option value="0" type="QString" name="labeling/shapeRadiiY"/>
-          <Option value="0" type="QString" name="labeling/shapeRotation"/>
-          <Option value="0" type="QString" name="labeling/shapeRotationType"/>
-          <Option value="" type="QString" name="labeling/shapeSVGFile"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shapeSizeMapUnitScale"/>
-          <Option value="0" type="QString" name="labeling/shapeSizeType"/>
-          <Option value="1" type="QString" name="labeling/shapeSizeUnits"/>
-          <Option value="0" type="QString" name="labeling/shapeSizeX"/>
-          <Option value="0" type="QString" name="labeling/shapeSizeY"/>
-          <Option value="0" type="QString" name="labeling/shapeTransparency"/>
-          <Option value="0" type="QString" name="labeling/shapeType"/>
-          <Option value="255" type="QString" name="labeling/textColorA"/>
-          <Option value="255" type="QString" name="labeling/textColorB"/>
-          <Option value="255" type="QString" name="labeling/textColorG"/>
-          <Option value="255" type="QString" name="labeling/textColorR"/>
-          <Option value="0" type="QString" name="labeling/textTransp"/>
-          <Option value="0" type="QString" name="labeling/upsidedownLabels"/>
-          <Option value="" type="QString" name="labeling/wrapChar"/>
-          <Option value="0" type="QString" name="labeling/xOffset"/>
-          <Option value="0" type="QString" name="labeling/yOffset"/>
-          <Option value="0" type="QString" name="labeling/zIndex"/>
+          <Option type="QString" value="0" name="embeddedWidgets/count"/>
+          <Option type="QString" value="false" name="labeling/addDirectionSymbol"/>
+          <Option type="QString" value="0" name="labeling/angleOffset"/>
+          <Option type="QString" value="0" name="labeling/blendMode"/>
+          <Option type="QString" value="0" name="labeling/bufferBlendMode"/>
+          <Option type="QString" value="255" name="labeling/bufferColorA"/>
+          <Option type="QString" value="255" name="labeling/bufferColorB"/>
+          <Option type="QString" value="255" name="labeling/bufferColorG"/>
+          <Option type="QString" value="255" name="labeling/bufferColorR"/>
+          <Option type="QString" value="false" name="labeling/bufferDraw"/>
+          <Option type="QString" value="64" name="labeling/bufferJoinStyle"/>
+          <Option type="QString" value="false" name="labeling/bufferNoFill"/>
+          <Option type="QString" value="1" name="labeling/bufferSize"/>
+          <Option type="QString" value="false" name="labeling/bufferSizeInMapUnits"/>
+          <Option type="QString" value="0,0,0,0,0,0" name="labeling/bufferSizeMapUnitScale"/>
+          <Option type="QString" value="0" name="labeling/bufferTransp"/>
+          <Option type="QString" value="false" name="labeling/centroidInside"/>
+          <Option type="QString" value="false" name="labeling/centroidWhole"/>
+          <Option type="QString" value="3" name="labeling/decimals"/>
+          <Option type="QString" value="false" name="labeling/displayAll"/>
+          <Option type="QString" value="0" name="labeling/dist"/>
+          <Option type="QString" value="false" name="labeling/distInMapUnits"/>
+          <Option type="QString" value="0,0,0,0,0,0" name="labeling/distMapUnitScale"/>
+          <Option type="QString" value="false" name="labeling/drawLabels"/>
+          <Option type="QString" value="false" name="labeling/enabled"/>
+          <Option type="QString" value="position" name="labeling/fieldName"/>
+          <Option type="QString" value="false" name="labeling/fitInPolygonOnly"/>
+          <Option type="QString" value="0" name="labeling/fontCapitals"/>
+          <Option type="QString" value="Myriad Pro" name="labeling/fontFamily"/>
+          <Option type="QString" value="false" name="labeling/fontItalic"/>
+          <Option type="QString" value="0" name="labeling/fontLetterSpacing"/>
+          <Option type="QString" value="false" name="labeling/fontLimitPixelSize"/>
+          <Option type="QString" value="10000" name="labeling/fontMaxPixelSize"/>
+          <Option type="QString" value="3" name="labeling/fontMinPixelSize"/>
+          <Option type="QString" value="10" name="labeling/fontSize"/>
+          <Option type="QString" value="false" name="labeling/fontSizeInMapUnits"/>
+          <Option type="QString" value="0,0,0,0,0,0" name="labeling/fontSizeMapUnitScale"/>
+          <Option type="QString" value="false" name="labeling/fontStrikeout"/>
+          <Option type="QString" value="false" name="labeling/fontUnderline"/>
+          <Option type="QString" value="63" name="labeling/fontWeight"/>
+          <Option type="QString" value="0" name="labeling/fontWordSpacing"/>
+          <Option type="QString" value="false" name="labeling/formatNumbers"/>
+          <Option type="QString" value="false" name="labeling/isExpression"/>
+          <Option type="QString" value="true" name="labeling/labelOffsetInMapUnits"/>
+          <Option type="QString" value="0,0,0,0,0,0" name="labeling/labelOffsetMapUnitScale"/>
+          <Option type="QString" value="false" name="labeling/labelPerPart"/>
+          <Option type="QString" value="&lt;" name="labeling/leftDirectionSymbol"/>
+          <Option type="QString" value="false" name="labeling/limitNumLabels"/>
+          <Option type="QString" value="20" name="labeling/maxCurvedCharAngleIn"/>
+          <Option type="QString" value="-20" name="labeling/maxCurvedCharAngleOut"/>
+          <Option type="QString" value="2000" name="labeling/maxNumLabels"/>
+          <Option type="QString" value="false" name="labeling/mergeLines"/>
+          <Option type="QString" value="0" name="labeling/minFeatureSize"/>
+          <Option type="QString" value="0" name="labeling/multilineAlign"/>
+          <Option type="QString" value="1" name="labeling/multilineHeight"/>
+          <Option type="QString" value="Semibold" name="labeling/namedStyle"/>
+          <Option type="QString" value="true" name="labeling/obstacle"/>
+          <Option type="QString" value="1" name="labeling/obstacleFactor"/>
+          <Option type="QString" value="0" name="labeling/obstacleType"/>
+          <Option type="QString" value="0" name="labeling/offsetType"/>
+          <Option type="QString" value="0" name="labeling/placeDirectionSymbol"/>
+          <Option type="QString" value="0" name="labeling/placement"/>
+          <Option type="QString" value="10" name="labeling/placementFlags"/>
+          <Option type="QString" value="false" name="labeling/plussign"/>
+          <Option type="QString" value="TR,TL,BR,BL,R,L,TSR,BSR" name="labeling/predefinedPositionOrder"/>
+          <Option type="QString" value="true" name="labeling/preserveRotation"/>
+          <Option type="QString" value="#ffffff" name="labeling/previewBkgrdColor"/>
+          <Option type="QString" value="5" name="labeling/priority"/>
+          <Option type="QString" value="4" name="labeling/quadOffset"/>
+          <Option type="QString" value="0" name="labeling/repeatDistance"/>
+          <Option type="QString" value="0,0,0,0,0,0" name="labeling/repeatDistanceMapUnitScale"/>
+          <Option type="QString" value="1" name="labeling/repeatDistanceUnit"/>
+          <Option type="QString" value="false" name="labeling/reverseDirectionSymbol"/>
+          <Option type="QString" value=">" name="labeling/rightDirectionSymbol"/>
+          <Option type="QString" value="10000000" name="labeling/scaleMax"/>
+          <Option type="QString" value="1" name="labeling/scaleMin"/>
+          <Option type="QString" value="false" name="labeling/scaleVisibility"/>
+          <Option type="QString" value="6" name="labeling/shadowBlendMode"/>
+          <Option type="QString" value="0" name="labeling/shadowColorB"/>
+          <Option type="QString" value="0" name="labeling/shadowColorG"/>
+          <Option type="QString" value="0" name="labeling/shadowColorR"/>
+          <Option type="QString" value="false" name="labeling/shadowDraw"/>
+          <Option type="QString" value="135" name="labeling/shadowOffsetAngle"/>
+          <Option type="QString" value="1" name="labeling/shadowOffsetDist"/>
+          <Option type="QString" value="true" name="labeling/shadowOffsetGlobal"/>
+          <Option type="QString" value="0,0,0,0,0,0" name="labeling/shadowOffsetMapUnitScale"/>
+          <Option type="QString" value="1" name="labeling/shadowOffsetUnits"/>
+          <Option type="QString" value="1.5" name="labeling/shadowRadius"/>
+          <Option type="QString" value="false" name="labeling/shadowRadiusAlphaOnly"/>
+          <Option type="QString" value="0,0,0,0,0,0" name="labeling/shadowRadiusMapUnitScale"/>
+          <Option type="QString" value="1" name="labeling/shadowRadiusUnits"/>
+          <Option type="QString" value="100" name="labeling/shadowScale"/>
+          <Option type="QString" value="30" name="labeling/shadowTransparency"/>
+          <Option type="QString" value="0" name="labeling/shadowUnder"/>
+          <Option type="QString" value="0" name="labeling/shapeBlendMode"/>
+          <Option type="QString" value="255" name="labeling/shapeBorderColorA"/>
+          <Option type="QString" value="128" name="labeling/shapeBorderColorB"/>
+          <Option type="QString" value="128" name="labeling/shapeBorderColorG"/>
+          <Option type="QString" value="128" name="labeling/shapeBorderColorR"/>
+          <Option type="QString" value="0" name="labeling/shapeBorderWidth"/>
+          <Option type="QString" value="0,0,0,0,0,0" name="labeling/shapeBorderWidthMapUnitScale"/>
+          <Option type="QString" value="1" name="labeling/shapeBorderWidthUnits"/>
+          <Option type="QString" value="true" name="labeling/shapeDraw"/>
+          <Option type="QString" value="255" name="labeling/shapeFillColorA"/>
+          <Option type="QString" value="138" name="labeling/shapeFillColorB"/>
+          <Option type="QString" value="0" name="labeling/shapeFillColorG"/>
+          <Option type="QString" value="101" name="labeling/shapeFillColorR"/>
+          <Option type="QString" value="64" name="labeling/shapeJoinStyle"/>
+          <Option type="QString" value="0,0,0,0,0,0" name="labeling/shapeOffsetMapUnitScale"/>
+          <Option type="QString" value="1" name="labeling/shapeOffsetUnits"/>
+          <Option type="QString" value="0" name="labeling/shapeOffsetX"/>
+          <Option type="QString" value="0" name="labeling/shapeOffsetY"/>
+          <Option type="QString" value="0,0,0,0,0,0" name="labeling/shapeRadiiMapUnitScale"/>
+          <Option type="QString" value="1" name="labeling/shapeRadiiUnits"/>
+          <Option type="QString" value="0" name="labeling/shapeRadiiX"/>
+          <Option type="QString" value="0" name="labeling/shapeRadiiY"/>
+          <Option type="QString" value="0" name="labeling/shapeRotation"/>
+          <Option type="QString" value="0" name="labeling/shapeRotationType"/>
+          <Option type="QString" value="" name="labeling/shapeSVGFile"/>
+          <Option type="QString" value="0,0,0,0,0,0" name="labeling/shapeSizeMapUnitScale"/>
+          <Option type="QString" value="0" name="labeling/shapeSizeType"/>
+          <Option type="QString" value="1" name="labeling/shapeSizeUnits"/>
+          <Option type="QString" value="0" name="labeling/shapeSizeX"/>
+          <Option type="QString" value="0" name="labeling/shapeSizeY"/>
+          <Option type="QString" value="0" name="labeling/shapeTransparency"/>
+          <Option type="QString" value="0" name="labeling/shapeType"/>
+          <Option type="QString" value="255" name="labeling/textColorA"/>
+          <Option type="QString" value="255" name="labeling/textColorB"/>
+          <Option type="QString" value="255" name="labeling/textColorG"/>
+          <Option type="QString" value="255" name="labeling/textColorR"/>
+          <Option type="QString" value="0" name="labeling/textTransp"/>
+          <Option type="QString" value="0" name="labeling/upsidedownLabels"/>
+          <Option type="QString" value="" name="labeling/wrapChar"/>
+          <Option type="QString" value="0" name="labeling/xOffset"/>
+          <Option type="QString" value="0" name="labeling/yOffset"/>
+          <Option type="QString" value="0" name="labeling/zIndex"/>
           <Option type="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -15483,48 +15485,48 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory penAlpha="255" width="15" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" minimumSize="0" enabled="0" maxScaleDenominator="1e+08" diagramOrientation="Up" opacity="1" scaleBasedVisibility="0" spacingUnit="MM" minScaleDenominator="100000" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" lineSizeType="MM" penWidth="0" backgroundAlpha="255" scaleDependency="Area" spacing="0" direction="1" barWidth="5" sizeType="MM" height="15" penColor="#000000" showAxis="0">
-          <fontProperties bold="0" style="" italic="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0"/>
-          <attribute label="" colorOpacity="1" field="" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory height="15" scaleDependency="Area" width="15" lineSizeScale="3x:0,0,0,0,0,0" spacingUnit="MM" lineSizeType="MM" penColor="#000000" spacing="0" labelPlacementMethod="XHeight" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" backgroundAlpha="255" maxScaleDenominator="1e+08" barWidth="5" penWidth="0" minimumSize="0" penAlpha="255" minScaleDenominator="100000" sizeType="MM" backgroundColor="#ffffff" enabled="0" opacity="1" direction="1" scaleBasedVisibility="0" showAxis="0" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270">
+          <fontProperties style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0" strikethrough="0" italic="0" underline="0" bold="0"/>
+          <attribute color="#000000" field="" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="35,35,35,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0.26" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -15555,9 +15557,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -15565,28 +15567,28 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="2" showAll="1" placement="0" zIndex="0" dist="0" priority="0" obstacle="0">
+      <DiagramLayerSettings priority="0" linePlacementFlags="2" obstacle="0" dist="0" zIndex="0" placement="0" showAll="1">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field configurationFlags="None" name="id">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -15595,8 +15597,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="false" type="bool" name="IsMultiline"/>
-                <Option value="false" type="bool" name="UseHtml"/>
+                <Option type="bool" value="false" name="IsMultiline"/>
+                <Option type="bool" value="false" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -15605,8 +15607,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="false" type="bool" name="IsMultiline"/>
-                <Option value="false" type="bool" name="UseHtml"/>
+                <Option type="bool" value="false" name="IsMultiline"/>
+                <Option type="bool" value="false" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -15615,8 +15617,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -15625,8 +15627,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -15649,8 +15651,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -15699,90 +15701,90 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
-        <alias index="1" name="" field="position"/>
-        <alias index="2" name="" field="type"/>
-        <alias index="3" name="" field="notes"/>
-        <alias index="4" name="" field="xyposition"/>
-        <alias index="5" name="" field="day"/>
-        <alias index="6" name="" field="csv_position"/>
-        <alias index="7" name="" field="csv_club"/>
-        <alias index="8" name="" field="csv_firstname"/>
-        <alias index="9" name="" field="csv_surname"/>
-        <alias index="10" name="" field="csv_days"/>
-        <alias index="11" name="" field="csv_first_runner"/>
-        <alias index="12" name="" field="csv_last_runner"/>
-        <alias index="13" name="" field="csv_instructions"/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="position" name=""/>
+        <alias index="2" field="type" name=""/>
+        <alias index="3" field="notes" name=""/>
+        <alias index="4" field="xyposition" name=""/>
+        <alias index="5" field="day" name=""/>
+        <alias index="6" field="csv_position" name=""/>
+        <alias index="7" field="csv_club" name=""/>
+        <alias index="8" field="csv_firstname" name=""/>
+        <alias index="9" field="csv_surname" name=""/>
+        <alias index="10" field="csv_days" name=""/>
+        <alias index="11" field="csv_first_runner" name=""/>
+        <alias index="12" field="csv_last_runner" name=""/>
+        <alias index="13" field="csv_instructions" name=""/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="position"/>
-        <default applyOnUpdate="0" expression="" field="type"/>
-        <default applyOnUpdate="0" expression="" field="notes"/>
-        <default applyOnUpdate="0" expression="" field="xyposition"/>
-        <default applyOnUpdate="0" expression="" field="day"/>
-        <default applyOnUpdate="0" expression="" field="csv_position"/>
-        <default applyOnUpdate="0" expression="" field="csv_club"/>
-        <default applyOnUpdate="0" expression="" field="csv_firstname"/>
-        <default applyOnUpdate="0" expression="" field="csv_surname"/>
-        <default applyOnUpdate="0" expression="" field="csv_days"/>
-        <default applyOnUpdate="0" expression="" field="csv_first_runner"/>
-        <default applyOnUpdate="0" expression="" field="csv_last_runner"/>
-        <default applyOnUpdate="0" expression="" field="csv_instructions"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="position" expression=""/>
+        <default applyOnUpdate="0" field="type" expression=""/>
+        <default applyOnUpdate="0" field="notes" expression=""/>
+        <default applyOnUpdate="0" field="xyposition" expression=""/>
+        <default applyOnUpdate="0" field="day" expression=""/>
+        <default applyOnUpdate="0" field="csv_position" expression=""/>
+        <default applyOnUpdate="0" field="csv_club" expression=""/>
+        <default applyOnUpdate="0" field="csv_firstname" expression=""/>
+        <default applyOnUpdate="0" field="csv_surname" expression=""/>
+        <default applyOnUpdate="0" field="csv_days" expression=""/>
+        <default applyOnUpdate="0" field="csv_first_runner" expression=""/>
+        <default applyOnUpdate="0" field="csv_last_runner" expression=""/>
+        <default applyOnUpdate="0" field="csv_instructions" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="id" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="position" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="type" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="notes" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="xyposition" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="day" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="csv_position" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="csv_club" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="csv_firstname" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="csv_surname" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="csv_days" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="csv_first_runner" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="csv_last_runner" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="csv_instructions" constraints="0"/>
+        <constraint exp_strength="0" field="id" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="position" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="type" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="notes" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="xyposition" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="day" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="csv_position" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="csv_club" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="csv_firstname" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="csv_surname" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="csv_days" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="csv_first_runner" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="csv_last_runner" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="csv_instructions" notnull_strength="0" constraints="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" desc="" field="id"/>
-        <constraint exp="" desc="" field="position"/>
-        <constraint exp="" desc="" field="type"/>
-        <constraint exp="" desc="" field="notes"/>
-        <constraint exp="" desc="" field="xyposition"/>
-        <constraint exp="" desc="" field="day"/>
-        <constraint exp="" desc="" field="csv_position"/>
-        <constraint exp="" desc="" field="csv_club"/>
-        <constraint exp="" desc="" field="csv_firstname"/>
-        <constraint exp="" desc="" field="csv_surname"/>
-        <constraint exp="" desc="" field="csv_days"/>
-        <constraint exp="" desc="" field="csv_first_runner"/>
-        <constraint exp="" desc="" field="csv_last_runner"/>
-        <constraint exp="" desc="" field="csv_instructions"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="position" desc=""/>
+        <constraint exp="" field="type" desc=""/>
+        <constraint exp="" field="notes" desc=""/>
+        <constraint exp="" field="xyposition" desc=""/>
+        <constraint exp="" field="day" desc=""/>
+        <constraint exp="" field="csv_position" desc=""/>
+        <constraint exp="" field="csv_club" desc=""/>
+        <constraint exp="" field="csv_firstname" desc=""/>
+        <constraint exp="" field="csv_surname" desc=""/>
+        <constraint exp="" field="csv_days" desc=""/>
+        <constraint exp="" field="csv_first_runner" desc=""/>
+        <constraint exp="" field="csv_last_runner" desc=""/>
+        <constraint exp="" field="csv_instructions" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="&quot;id&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="&quot;id&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column width="-1" type="field" name="id" hidden="0"/>
+          <column width="-1" type="field" hidden="0" name="id"/>
           <column width="-1" type="actions" hidden="1"/>
-          <column width="-1" type="field" name="position" hidden="0"/>
-          <column width="-1" type="field" name="type" hidden="0"/>
-          <column width="-1" type="field" name="notes" hidden="0"/>
-          <column width="-1" type="field" name="xyposition" hidden="0"/>
-          <column width="-1" type="field" name="csv_club" hidden="0"/>
-          <column width="-1" type="field" name="csv_first_runner" hidden="0"/>
-          <column width="-1" type="field" name="csv_last_runner" hidden="0"/>
-          <column width="-1" type="field" name="csv_firstname" hidden="0"/>
-          <column width="-1" type="field" name="csv_surname" hidden="0"/>
-          <column width="-1" type="field" name="csv_position" hidden="0"/>
-          <column width="-1" type="field" name="csv_days" hidden="0"/>
-          <column width="-1" type="field" name="day" hidden="0"/>
-          <column width="-1" type="field" name="csv_instructions" hidden="0"/>
+          <column width="-1" type="field" hidden="0" name="position"/>
+          <column width="-1" type="field" hidden="0" name="type"/>
+          <column width="-1" type="field" hidden="0" name="notes"/>
+          <column width="-1" type="field" hidden="0" name="xyposition"/>
+          <column width="-1" type="field" hidden="0" name="csv_club"/>
+          <column width="-1" type="field" hidden="0" name="csv_first_runner"/>
+          <column width="-1" type="field" hidden="0" name="csv_last_runner"/>
+          <column width="-1" type="field" hidden="0" name="csv_firstname"/>
+          <column width="-1" type="field" hidden="0" name="csv_surname"/>
+          <column width="-1" type="field" hidden="0" name="csv_position"/>
+          <column width="-1" type="field" hidden="0" name="csv_days"/>
+          <column width="-1" type="field" hidden="0" name="day"/>
+          <column width="-1" type="field" hidden="0" name="csv_instructions"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -15814,99 +15816,99 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="csv_10_distance" editable="0"/>
-        <field name="csv_21_distance" editable="0"/>
-        <field name="csv_Description" editable="0"/>
-        <field name="csv_capt_1" editable="1"/>
-        <field name="csv_captai" editable="1"/>
-        <field name="csv_captain" editable="0"/>
-        <field name="csv_captain_email" editable="0"/>
-        <field name="csv_captain_number" editable="0"/>
-        <field name="csv_captain_phone" editable="0"/>
-        <field name="csv_club" editable="0"/>
-        <field name="csv_days" editable="0"/>
-        <field name="csv_email" editable="0"/>
-        <field name="csv_first runner" editable="0"/>
-        <field name="csv_first_" editable="1"/>
-        <field name="csv_first_runner" editable="0"/>
-        <field name="csv_firstname" editable="0"/>
-        <field name="csv_instru" editable="1"/>
-        <field name="csv_instructions" editable="0"/>
-        <field name="csv_last runner" editable="0"/>
-        <field name="csv_last_r" editable="1"/>
-        <field name="csv_last_runner" editable="0"/>
-        <field name="csv_name" editable="0"/>
-        <field name="csv_phone" editable="0"/>
-        <field name="csv_positi" editable="1"/>
-        <field name="csv_position" editable="0"/>
-        <field name="csv_races" editable="0"/>
-        <field name="csv_surname" editable="0"/>
-        <field name="day" editable="1"/>
-        <field name="id" editable="1"/>
-        <field name="notes" editable="1"/>
-        <field name="oldpositio" editable="1"/>
-        <field name="position" editable="1"/>
-        <field name="type" editable="1"/>
-        <field name="xyposition" editable="1"/>
+        <field editable="0" name="csv_10_distance"/>
+        <field editable="0" name="csv_21_distance"/>
+        <field editable="0" name="csv_Description"/>
+        <field editable="1" name="csv_capt_1"/>
+        <field editable="1" name="csv_captai"/>
+        <field editable="0" name="csv_captain"/>
+        <field editable="0" name="csv_captain_email"/>
+        <field editable="0" name="csv_captain_number"/>
+        <field editable="0" name="csv_captain_phone"/>
+        <field editable="0" name="csv_club"/>
+        <field editable="0" name="csv_days"/>
+        <field editable="0" name="csv_email"/>
+        <field editable="0" name="csv_first runner"/>
+        <field editable="1" name="csv_first_"/>
+        <field editable="0" name="csv_first_runner"/>
+        <field editable="0" name="csv_firstname"/>
+        <field editable="1" name="csv_instru"/>
+        <field editable="0" name="csv_instructions"/>
+        <field editable="0" name="csv_last runner"/>
+        <field editable="1" name="csv_last_r"/>
+        <field editable="0" name="csv_last_runner"/>
+        <field editable="0" name="csv_name"/>
+        <field editable="0" name="csv_phone"/>
+        <field editable="1" name="csv_positi"/>
+        <field editable="0" name="csv_position"/>
+        <field editable="0" name="csv_races"/>
+        <field editable="0" name="csv_surname"/>
+        <field editable="1" name="day"/>
+        <field editable="1" name="id"/>
+        <field editable="1" name="notes"/>
+        <field editable="1" name="oldpositio"/>
+        <field editable="1" name="position"/>
+        <field editable="1" name="type"/>
+        <field editable="1" name="xyposition"/>
       </editable>
       <labelOnTop>
-        <field name="csv_10_distance" labelOnTop="0"/>
-        <field name="csv_21_distance" labelOnTop="0"/>
-        <field name="csv_Description" labelOnTop="0"/>
-        <field name="csv_capt_1" labelOnTop="0"/>
-        <field name="csv_captai" labelOnTop="0"/>
-        <field name="csv_captain" labelOnTop="0"/>
-        <field name="csv_captain_email" labelOnTop="0"/>
-        <field name="csv_captain_number" labelOnTop="0"/>
-        <field name="csv_captain_phone" labelOnTop="0"/>
-        <field name="csv_club" labelOnTop="0"/>
-        <field name="csv_days" labelOnTop="0"/>
-        <field name="csv_email" labelOnTop="0"/>
-        <field name="csv_first runner" labelOnTop="0"/>
-        <field name="csv_first_" labelOnTop="0"/>
-        <field name="csv_first_runner" labelOnTop="0"/>
-        <field name="csv_firstname" labelOnTop="0"/>
-        <field name="csv_instru" labelOnTop="0"/>
-        <field name="csv_instructions" labelOnTop="0"/>
-        <field name="csv_last runner" labelOnTop="0"/>
-        <field name="csv_last_r" labelOnTop="0"/>
-        <field name="csv_last_runner" labelOnTop="0"/>
-        <field name="csv_name" labelOnTop="0"/>
-        <field name="csv_phone" labelOnTop="0"/>
-        <field name="csv_positi" labelOnTop="0"/>
-        <field name="csv_position" labelOnTop="0"/>
-        <field name="csv_races" labelOnTop="0"/>
-        <field name="csv_surname" labelOnTop="0"/>
-        <field name="day" labelOnTop="0"/>
-        <field name="id" labelOnTop="0"/>
-        <field name="notes" labelOnTop="0"/>
-        <field name="oldpositio" labelOnTop="0"/>
-        <field name="position" labelOnTop="0"/>
-        <field name="type" labelOnTop="0"/>
-        <field name="xyposition" labelOnTop="0"/>
+        <field labelOnTop="0" name="csv_10_distance"/>
+        <field labelOnTop="0" name="csv_21_distance"/>
+        <field labelOnTop="0" name="csv_Description"/>
+        <field labelOnTop="0" name="csv_capt_1"/>
+        <field labelOnTop="0" name="csv_captai"/>
+        <field labelOnTop="0" name="csv_captain"/>
+        <field labelOnTop="0" name="csv_captain_email"/>
+        <field labelOnTop="0" name="csv_captain_number"/>
+        <field labelOnTop="0" name="csv_captain_phone"/>
+        <field labelOnTop="0" name="csv_club"/>
+        <field labelOnTop="0" name="csv_days"/>
+        <field labelOnTop="0" name="csv_email"/>
+        <field labelOnTop="0" name="csv_first runner"/>
+        <field labelOnTop="0" name="csv_first_"/>
+        <field labelOnTop="0" name="csv_first_runner"/>
+        <field labelOnTop="0" name="csv_firstname"/>
+        <field labelOnTop="0" name="csv_instru"/>
+        <field labelOnTop="0" name="csv_instructions"/>
+        <field labelOnTop="0" name="csv_last runner"/>
+        <field labelOnTop="0" name="csv_last_r"/>
+        <field labelOnTop="0" name="csv_last_runner"/>
+        <field labelOnTop="0" name="csv_name"/>
+        <field labelOnTop="0" name="csv_phone"/>
+        <field labelOnTop="0" name="csv_positi"/>
+        <field labelOnTop="0" name="csv_position"/>
+        <field labelOnTop="0" name="csv_races"/>
+        <field labelOnTop="0" name="csv_surname"/>
+        <field labelOnTop="0" name="day"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="notes"/>
+        <field labelOnTop="0" name="oldpositio"/>
+        <field labelOnTop="0" name="position"/>
+        <field labelOnTop="0" name="type"/>
+        <field labelOnTop="0" name="xyposition"/>
       </labelOnTop>
       <reuseLastValue>
-        <field name="csv_captain" reuseLastValue="0"/>
-        <field name="csv_captain_email" reuseLastValue="0"/>
-        <field name="csv_captain_phone" reuseLastValue="0"/>
-        <field name="csv_club" reuseLastValue="0"/>
-        <field name="csv_days" reuseLastValue="0"/>
-        <field name="csv_email" reuseLastValue="0"/>
-        <field name="csv_first_runner" reuseLastValue="0"/>
-        <field name="csv_firstname" reuseLastValue="0"/>
-        <field name="csv_instructions" reuseLastValue="0"/>
-        <field name="csv_last_runner" reuseLastValue="0"/>
-        <field name="csv_name" reuseLastValue="0"/>
-        <field name="csv_phone" reuseLastValue="0"/>
-        <field name="csv_position" reuseLastValue="0"/>
-        <field name="csv_races" reuseLastValue="0"/>
-        <field name="csv_surname" reuseLastValue="0"/>
-        <field name="day" reuseLastValue="0"/>
-        <field name="id" reuseLastValue="0"/>
-        <field name="notes" reuseLastValue="0"/>
-        <field name="position" reuseLastValue="0"/>
-        <field name="type" reuseLastValue="0"/>
-        <field name="xyposition" reuseLastValue="0"/>
+        <field reuseLastValue="0" name="csv_captain"/>
+        <field reuseLastValue="0" name="csv_captain_email"/>
+        <field reuseLastValue="0" name="csv_captain_phone"/>
+        <field reuseLastValue="0" name="csv_club"/>
+        <field reuseLastValue="0" name="csv_days"/>
+        <field reuseLastValue="0" name="csv_email"/>
+        <field reuseLastValue="0" name="csv_first_runner"/>
+        <field reuseLastValue="0" name="csv_firstname"/>
+        <field reuseLastValue="0" name="csv_instructions"/>
+        <field reuseLastValue="0" name="csv_last_runner"/>
+        <field reuseLastValue="0" name="csv_name"/>
+        <field reuseLastValue="0" name="csv_phone"/>
+        <field reuseLastValue="0" name="csv_position"/>
+        <field reuseLastValue="0" name="csv_races"/>
+        <field reuseLastValue="0" name="csv_surname"/>
+        <field reuseLastValue="0" name="day"/>
+        <field reuseLastValue="0" name="id"/>
+        <field reuseLastValue="0" name="notes"/>
+        <field reuseLastValue="0" name="position"/>
+        <field reuseLastValue="0" name="type"/>
+        <field reuseLastValue="0" name="xyposition"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets>
@@ -15956,7 +15958,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip>name</mapTip>
     </maplayer>
-    <maplayer minScale="1e+08" refreshOnNotifyEnabled="0" autoRefreshTime="0" maxScale="100000" type="vector" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" geometry="No geometry" autoRefreshEnabled="0" legendPlaceholderImage="" wkbType="NoGeometry" readOnly="0" refreshOnNotifyMessage="">
+    <maplayer refreshOnNotifyEnabled="0" refreshOnNotifyMessage="" minScale="1e+08" hasScaleBasedVisibilityFlag="0" type="vector" wkbType="NoGeometry" maxScale="100000" readOnly="0" legendPlaceholderImage="" styleCategories="AllStyleCategories" autoRefreshTime="0" geometry="No geometry" autoRefreshEnabled="0">
       <id>marshals_by_position20161003112326575</id>
       <datasource>file:./marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes</datasource>
       <keywordList>
@@ -16009,7 +16011,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxy="0" minz="0" dimensions="2" maxx="0" maxz="0" miny="0" minx="0" crs=""/>
+          <spatial maxz="0" minx="0" maxx="0" minz="0" crs="" miny="0" maxy="0" dimensions="2"/>
           <temporal>
             <period>
               <start></start>
@@ -16037,58 +16039,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" startExpression="" mode="0" limitMode="0" endField="" fixedDuration="0" accumulate="0" durationUnit="min" startField="" endExpression="" enabled="0">
+      <temporal durationField="" fixedDuration="0" accumulate="0" endField="" startField="" enabled="0" startExpression="" endExpression="" durationUnit="min" mode="0" limitMode="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" zscale="1" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" binding="Centroid" type="IndividualFeatures" symbology="Line" extrusion="0" zoffset="0">
+      <elevation extrusionEnabled="0" symbology="Line" type="IndividualFeatures" zscale="1" clamping="Terrain" showMarkerSymbolInSurfacePlots="0" zoffset="0" extrusion="0" respectLayerSymbol="1" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="243,166,178,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="243,166,178,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -16119,36 +16121,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="243,166,178,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="174,119,127,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="243,166,178,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="174,119,127,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="243,166,178,255"/>
@@ -16163,44 +16165,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="243,166,178,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="174,119,127,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="243,166,178,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="diamond" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="174,119,127,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="3" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -16223,9 +16225,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -16234,28 +16236,28 @@ def my_form_open(dialog, layer, feature):
       </elevation>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option value="first_name" type="QString" name="dualview/previewExpressions"/>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="QString" value="copy" name="QFieldSync/action"/>
+          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="first_name" name="dualview/previewExpressions"/>
+          <Option type="QString" value="0" name="embeddedWidgets/count"/>
           <Option type="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
       </customproperties>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field configurationFlags="None" name="position">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -16264,8 +16266,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -16288,8 +16290,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -16298,8 +16300,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -16308,8 +16310,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -16318,8 +16320,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -16349,8 +16351,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -16378,94 +16380,94 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="position"/>
-        <alias index="1" name="" field="club"/>
-        <alias index="2" name="" field="firstname"/>
-        <alias index="3" name="" field="surname"/>
-        <alias index="4" name="" field="name"/>
-        <alias index="5" name="" field="phone"/>
-        <alias index="6" name="" field="email"/>
-        <alias index="7" name="" field="captain"/>
-        <alias index="8" name="" field="captain_phone"/>
-        <alias index="9" name="" field="captain_email"/>
-        <alias index="10" name="" field="days"/>
-        <alias index="11" name="" field="races"/>
-        <alias index="12" name="" field="first_runner"/>
-        <alias index="13" name="" field="last_runner"/>
-        <alias index="14" name="" field="instructions"/>
+        <alias index="0" field="position" name=""/>
+        <alias index="1" field="club" name=""/>
+        <alias index="2" field="firstname" name=""/>
+        <alias index="3" field="surname" name=""/>
+        <alias index="4" field="name" name=""/>
+        <alias index="5" field="phone" name=""/>
+        <alias index="6" field="email" name=""/>
+        <alias index="7" field="captain" name=""/>
+        <alias index="8" field="captain_phone" name=""/>
+        <alias index="9" field="captain_email" name=""/>
+        <alias index="10" field="days" name=""/>
+        <alias index="11" field="races" name=""/>
+        <alias index="12" field="first_runner" name=""/>
+        <alias index="13" field="last_runner" name=""/>
+        <alias index="14" field="instructions" name=""/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="position"/>
-        <default applyOnUpdate="0" expression="" field="club"/>
-        <default applyOnUpdate="0" expression="" field="firstname"/>
-        <default applyOnUpdate="0" expression="" field="surname"/>
-        <default applyOnUpdate="0" expression="" field="name"/>
-        <default applyOnUpdate="0" expression="" field="phone"/>
-        <default applyOnUpdate="0" expression="" field="email"/>
-        <default applyOnUpdate="0" expression="" field="captain"/>
-        <default applyOnUpdate="0" expression="" field="captain_phone"/>
-        <default applyOnUpdate="0" expression="" field="captain_email"/>
-        <default applyOnUpdate="0" expression="" field="days"/>
-        <default applyOnUpdate="0" expression="" field="races"/>
-        <default applyOnUpdate="0" expression="" field="first_runner"/>
-        <default applyOnUpdate="0" expression="" field="last_runner"/>
-        <default applyOnUpdate="0" expression="" field="instructions"/>
+        <default applyOnUpdate="0" field="position" expression=""/>
+        <default applyOnUpdate="0" field="club" expression=""/>
+        <default applyOnUpdate="0" field="firstname" expression=""/>
+        <default applyOnUpdate="0" field="surname" expression=""/>
+        <default applyOnUpdate="0" field="name" expression=""/>
+        <default applyOnUpdate="0" field="phone" expression=""/>
+        <default applyOnUpdate="0" field="email" expression=""/>
+        <default applyOnUpdate="0" field="captain" expression=""/>
+        <default applyOnUpdate="0" field="captain_phone" expression=""/>
+        <default applyOnUpdate="0" field="captain_email" expression=""/>
+        <default applyOnUpdate="0" field="days" expression=""/>
+        <default applyOnUpdate="0" field="races" expression=""/>
+        <default applyOnUpdate="0" field="first_runner" expression=""/>
+        <default applyOnUpdate="0" field="last_runner" expression=""/>
+        <default applyOnUpdate="0" field="instructions" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="position" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="club" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="firstname" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="surname" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="name" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="phone" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="email" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="captain" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="captain_phone" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="captain_email" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="days" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="races" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="first_runner" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="last_runner" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="instructions" constraints="0"/>
+        <constraint exp_strength="0" field="position" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="club" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="firstname" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="surname" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="name" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="phone" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="email" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="captain" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="captain_phone" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="captain_email" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="days" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="races" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="first_runner" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="last_runner" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="instructions" notnull_strength="0" constraints="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" desc="" field="position"/>
-        <constraint exp="" desc="" field="club"/>
-        <constraint exp="" desc="" field="firstname"/>
-        <constraint exp="" desc="" field="surname"/>
-        <constraint exp="" desc="" field="name"/>
-        <constraint exp="" desc="" field="phone"/>
-        <constraint exp="" desc="" field="email"/>
-        <constraint exp="" desc="" field="captain"/>
-        <constraint exp="" desc="" field="captain_phone"/>
-        <constraint exp="" desc="" field="captain_email"/>
-        <constraint exp="" desc="" field="days"/>
-        <constraint exp="" desc="" field="races"/>
-        <constraint exp="" desc="" field="first_runner"/>
-        <constraint exp="" desc="" field="last_runner"/>
-        <constraint exp="" desc="" field="instructions"/>
+        <constraint exp="" field="position" desc=""/>
+        <constraint exp="" field="club" desc=""/>
+        <constraint exp="" field="firstname" desc=""/>
+        <constraint exp="" field="surname" desc=""/>
+        <constraint exp="" field="name" desc=""/>
+        <constraint exp="" field="phone" desc=""/>
+        <constraint exp="" field="email" desc=""/>
+        <constraint exp="" field="captain" desc=""/>
+        <constraint exp="" field="captain_phone" desc=""/>
+        <constraint exp="" field="captain_email" desc=""/>
+        <constraint exp="" field="days" desc=""/>
+        <constraint exp="" field="races" desc=""/>
+        <constraint exp="" field="first_runner" desc=""/>
+        <constraint exp="" field="last_runner" desc=""/>
+        <constraint exp="" field="instructions" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column width="-1" type="field" name="position" hidden="0"/>
-          <column width="221" type="field" name="name" hidden="0"/>
-          <column width="-1" type="field" name="club" hidden="0"/>
-          <column width="-1" type="field" name="phone" hidden="0"/>
-          <column width="-1" type="field" name="email" hidden="0"/>
-          <column width="-1" type="field" name="captain" hidden="0"/>
-          <column width="-1" type="field" name="races" hidden="0"/>
+          <column width="-1" type="field" hidden="0" name="position"/>
+          <column width="221" type="field" hidden="0" name="name"/>
+          <column width="-1" type="field" hidden="0" name="club"/>
+          <column width="-1" type="field" hidden="0" name="phone"/>
+          <column width="-1" type="field" hidden="0" name="email"/>
+          <column width="-1" type="field" hidden="0" name="captain"/>
+          <column width="-1" type="field" hidden="0" name="races"/>
           <column width="-1" type="actions" hidden="1"/>
-          <column width="-1" type="field" name="first_runner" hidden="0"/>
-          <column width="-1" type="field" name="last_runner" hidden="0"/>
-          <column width="-1" type="field" name="instructions" hidden="0"/>
-          <column width="-1" type="field" name="firstname" hidden="0"/>
-          <column width="-1" type="field" name="surname" hidden="0"/>
-          <column width="-1" type="field" name="captain_phone" hidden="0"/>
-          <column width="-1" type="field" name="captain_email" hidden="0"/>
+          <column width="-1" type="field" hidden="0" name="first_runner"/>
+          <column width="-1" type="field" hidden="0" name="last_runner"/>
+          <column width="-1" type="field" hidden="0" name="instructions"/>
+          <column width="-1" type="field" hidden="0" name="firstname"/>
+          <column width="-1" type="field" hidden="0" name="surname"/>
+          <column width="-1" type="field" hidden="0" name="captain_phone"/>
+          <column width="-1" type="field" hidden="0" name="captain_email"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -16497,42 +16499,42 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="10_distance" editable="1"/>
-        <field name="21_distance" editable="1"/>
-        <field name="5_distance" editable="1"/>
-        <field name="captain" editable="1"/>
-        <field name="captain_number" editable="1"/>
-        <field name="club" editable="1"/>
-        <field name="email" editable="1"/>
-        <field name="first_name" editable="1"/>
-        <field name="first_runner" editable="1"/>
-        <field name="instructions" editable="1"/>
-        <field name="last_name" editable="1"/>
-        <field name="last_runner" editable="1"/>
-        <field name="name" editable="1"/>
-        <field name="phone" editable="1"/>
-        <field name="position" editable="1"/>
-        <field name="races" editable="1"/>
-        <field name="tshirt" editable="1"/>
+        <field editable="1" name="10_distance"/>
+        <field editable="1" name="21_distance"/>
+        <field editable="1" name="5_distance"/>
+        <field editable="1" name="captain"/>
+        <field editable="1" name="captain_number"/>
+        <field editable="1" name="club"/>
+        <field editable="1" name="email"/>
+        <field editable="1" name="first_name"/>
+        <field editable="1" name="first_runner"/>
+        <field editable="1" name="instructions"/>
+        <field editable="1" name="last_name"/>
+        <field editable="1" name="last_runner"/>
+        <field editable="1" name="name"/>
+        <field editable="1" name="phone"/>
+        <field editable="1" name="position"/>
+        <field editable="1" name="races"/>
+        <field editable="1" name="tshirt"/>
       </editable>
       <labelOnTop>
-        <field name="10_distance" labelOnTop="0"/>
-        <field name="21_distance" labelOnTop="0"/>
-        <field name="5_distance" labelOnTop="0"/>
-        <field name="captain" labelOnTop="0"/>
-        <field name="captain_number" labelOnTop="0"/>
-        <field name="club" labelOnTop="0"/>
-        <field name="email" labelOnTop="0"/>
-        <field name="first_name" labelOnTop="0"/>
-        <field name="first_runner" labelOnTop="0"/>
-        <field name="instructions" labelOnTop="0"/>
-        <field name="last_name" labelOnTop="0"/>
-        <field name="last_runner" labelOnTop="0"/>
-        <field name="name" labelOnTop="0"/>
-        <field name="phone" labelOnTop="0"/>
-        <field name="position" labelOnTop="0"/>
-        <field name="races" labelOnTop="0"/>
-        <field name="tshirt" labelOnTop="0"/>
+        <field labelOnTop="0" name="10_distance"/>
+        <field labelOnTop="0" name="21_distance"/>
+        <field labelOnTop="0" name="5_distance"/>
+        <field labelOnTop="0" name="captain"/>
+        <field labelOnTop="0" name="captain_number"/>
+        <field labelOnTop="0" name="club"/>
+        <field labelOnTop="0" name="email"/>
+        <field labelOnTop="0" name="first_name"/>
+        <field labelOnTop="0" name="first_runner"/>
+        <field labelOnTop="0" name="instructions"/>
+        <field labelOnTop="0" name="last_name"/>
+        <field labelOnTop="0" name="last_runner"/>
+        <field labelOnTop="0" name="name"/>
+        <field labelOnTop="0" name="phone"/>
+        <field labelOnTop="0" name="position"/>
+        <field labelOnTop="0" name="races"/>
+        <field labelOnTop="0" name="tshirt"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -16540,7 +16542,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>first_name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" simplifyLocal="1" autoRefreshTime="0" wkbType="MultiLineString" simplifyDrawingHints="1" type="vector" symbologyReferenceScale="-1" minScale="100000000" legendPlaceholderImage="" refreshOnNotifyEnabled="0" labelsEnabled="0" maxScale="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" refreshOnNotifyMessage="" readOnly="0" geometry="Line" autoRefreshEnabled="0" simplifyDrawingTol="1">
+    <maplayer simplifyLocal="1" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1" legendPlaceholderImage="" symbologyReferenceScale="-1" readOnly="0" refreshOnNotifyEnabled="0" minScale="100000000" maxScale="0" type="vector" autoRefreshTime="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="0" styleCategories="AllStyleCategories" geometry="Line" autoRefreshEnabled="0" wkbType="MultiLineString">
       <extent>
         <xmin>18.41055689999999956</xmin>
         <ymin>-33.9145735999999971</ymin>
@@ -16605,7 +16607,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxy="0" minz="0" dimensions="2" maxx="0" maxz="0" miny="0" minx="0" crs=""/>
+          <spatial maxz="0" minx="0" maxx="0" minz="0" crs="" miny="0" maxy="0" dimensions="2"/>
           <temporal>
             <period>
               <start></start>
@@ -16630,58 +16632,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" startExpression="" mode="0" limitMode="0" endField="" fixedDuration="0" accumulate="0" durationUnit="min" startField="" endExpression="" enabled="0">
+      <temporal durationField="" fixedDuration="0" accumulate="0" endField="" startField="" enabled="0" startExpression="" endExpression="" durationUnit="min" mode="0" limitMode="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" zscale="1" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" binding="Centroid" type="IndividualFeatures" symbology="Line" extrusion="0" zoffset="0">
+      <elevation extrusionEnabled="0" symbology="Line" type="IndividualFeatures" zscale="1" clamping="Terrain" showMarkerSymbolInSurfacePlots="0" zoffset="0" extrusion="0" respectLayerSymbol="1" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="141,90,153,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="141,90,153,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -16712,36 +16714,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="141,90,153,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="101,64,109,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="141,90,153,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="101,64,109,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="141,90,153,255"/>
@@ -16756,44 +16758,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="141,90,153,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="101,64,109,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="141,90,153,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="diamond" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="101,64,109,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="3" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -16816,58 +16818,58 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" type="RuleRenderer" symbollevels="0" referencescale="-1" enableorderby="0">
+      <renderer-v2 enableorderby="0" type="RuleRenderer" symbollevels="0" referencescale="-1" forceraster="0">
         <rules key="{5bddb61b-4527-4f61-bf00-ae5121d1f9fd}">
-          <rule filter="&quot;type&quot; IS 'car'" symbol="0" label="Car" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}"/>
-          <rule filter="&quot;type&quot; IS 'walk'" symbol="1" label="Walking" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}"/>
+          <rule symbol="0" label="Car" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}" filter="&quot;type&quot; IS 'car'"/>
+          <rule symbol="1" label="Walking" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}" filter="&quot;type&quot; IS 'walk'"/>
         </rules>
         <symbols>
-          <symbol is_animated="0" type="line" name="0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="123,211,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="1" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="123,211,0,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="1" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -16898,50 +16900,50 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" type="line" name="1" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="flat" type="QString" name="capstyle"/>
-                <Option value="4;1;1;1" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="103,34,144,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="1.25" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="1" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="flat" name="capstyle"/>
+                <Option type="QString" value="4;1;1;1" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="103,34,144,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="1.25" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="1" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="flat"/>
@@ -16972,30 +16974,30 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="LastVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="3" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="LastVertex" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -17015,33 +17017,33 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" type="marker" name="@1@1" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+              <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@1@1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer locked="0" class="FilledMarker" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="103,34,144,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="5" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="103,34,144,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="filled_arrowhead" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="5" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="103,34,144,255"/>
@@ -17057,32 +17059,32 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol is_animated="0" type="fill" name="@@1@1@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+                  <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@@1@1@0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="103,34,144,255" type="QString" name="color"/>
-                        <Option value="miter" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                        <Option value="no" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="103,34,144,255" name="color"/>
+                        <Option type="QString" value="miter" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                        <Option type="QString" value="no" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="103,34,144,255"/>
@@ -17097,9 +17099,9 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -17112,11 +17114,11 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option value="id" type="QString" name="dualview/previewExpressions"/>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="QString" value="copy" name="QFieldSync/action"/>
+          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="id" name="dualview/previewExpressions"/>
+          <Option type="QString" value="0" name="embeddedWidgets/count"/>
           <Option type="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -17124,48 +17126,48 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory penAlpha="255" width="15" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" minimumSize="0" enabled="0" maxScaleDenominator="1e+08" diagramOrientation="Up" opacity="1" scaleBasedVisibility="0" spacingUnit="MM" minScaleDenominator="0" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" lineSizeType="MM" penWidth="0" backgroundAlpha="255" scaleDependency="Area" spacing="0" direction="1" barWidth="5" sizeType="MM" height="15" penColor="#000000" showAxis="0">
-          <fontProperties bold="0" style="0" italic="1" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" strikethrough="0"/>
-          <attribute label="" colorOpacity="1" field="" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory height="15" scaleDependency="Area" width="15" lineSizeScale="3x:0,0,0,0,0,0" spacingUnit="MM" lineSizeType="MM" penColor="#000000" spacing="0" labelPlacementMethod="XHeight" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" backgroundAlpha="255" maxScaleDenominator="1e+08" barWidth="5" penWidth="0" minimumSize="0" penAlpha="255" minScaleDenominator="0" sizeType="MM" backgroundColor="#ffffff" enabled="0" opacity="1" direction="1" scaleBasedVisibility="0" showAxis="0" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270">
+          <fontProperties style="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" strikethrough="0" italic="1" underline="0" bold="0"/>
+          <attribute color="#000000" field="" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="35,35,35,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0.26" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -17196,9 +17198,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -17206,20 +17208,20 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" showAll="1" placement="2" zIndex="0" dist="0" priority="0" obstacle="0">
+      <DiagramLayerSettings priority="0" linePlacementFlags="18" obstacle="0" dist="0" zIndex="0" placement="2" showAll="1">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field configurationFlags="None" name="id">
@@ -17238,30 +17240,30 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
-        <alias index="1" name="" field="type"/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="type" name=""/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="type"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="type" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="id" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="type" constraints="0"/>
+        <constraint exp_strength="0" field="id" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="type" notnull_strength="0" constraints="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" desc="" field="id"/>
-        <constraint exp="" desc="" field="type"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="type" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column width="-1" type="field" name="id" hidden="0"/>
+          <column width="-1" type="field" hidden="0" name="id"/>
           <column width="-1" type="actions" hidden="1"/>
-          <column width="-1" type="field" name="type" hidden="0"/>
+          <column width="-1" type="field" hidden="0" name="type"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -17293,12 +17295,12 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="id" editable="1"/>
-        <field name="type" editable="1"/>
+        <field editable="1" name="id"/>
+        <field editable="1" name="type"/>
       </editable>
       <labelOnTop>
-        <field name="id" labelOnTop="0"/>
-        <field name="type" labelOnTop="0"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="type"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -17306,7 +17308,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" simplifyLocal="1" autoRefreshTime="0" wkbType="Point" simplifyDrawingHints="0" type="vector" symbologyReferenceScale="-1" minScale="100000000" legendPlaceholderImage="" refreshOnNotifyEnabled="0" labelsEnabled="1" maxScale="100000" styleCategories="AllStyleCategories" simplifyAlgorithm="0" refreshOnNotifyMessage="" readOnly="0" geometry="Point" autoRefreshEnabled="0" simplifyDrawingTol="1">
+    <maplayer simplifyLocal="1" simplifyDrawingHints="0" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1" legendPlaceholderImage="" symbologyReferenceScale="-1" readOnly="0" refreshOnNotifyEnabled="0" minScale="100000000" maxScale="100000" type="vector" autoRefreshTime="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="1" styleCategories="AllStyleCategories" geometry="Point" autoRefreshEnabled="0" wkbType="Point">
       <extent>
         <xmin>18.37896929129519208</xmin>
         <ymin>-33.93500027904928373</ymin>
@@ -17371,7 +17373,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxy="0" minz="0" dimensions="2" maxx="0" maxz="0" miny="0" minx="0" crs=""/>
+          <spatial maxz="0" minx="0" maxx="0" minz="0" crs="" miny="0" maxy="0" dimensions="2"/>
           <temporal>
             <period>
               <start></start>
@@ -17396,58 +17398,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" startExpression="" mode="0" limitMode="0" endField="" fixedDuration="0" accumulate="0" durationUnit="min" startField="" endExpression="" enabled="0">
+      <temporal durationField="" fixedDuration="0" accumulate="0" endField="" startField="" enabled="0" startExpression="" endExpression="" durationUnit="min" mode="0" limitMode="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" zscale="1" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" binding="Centroid" type="IndividualFeatures" symbology="Line" extrusion="0" zoffset="0">
+      <elevation extrusionEnabled="0" symbology="Line" type="IndividualFeatures" zscale="1" clamping="Terrain" showMarkerSymbolInSurfacePlots="0" zoffset="0" extrusion="0" respectLayerSymbol="1" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="232,113,141,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="232,113,141,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -17478,36 +17480,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="232,113,141,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="166,81,101,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="232,113,141,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="166,81,101,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="232,113,141,255"/>
@@ -17522,44 +17524,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="232,113,141,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="166,81,101,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="232,113,141,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="diamond" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="166,81,101,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="3" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -17582,44 +17584,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" type="nullSymbol" symbollevels="0" referencescale="-1" enableorderby="0"/>
+      <renderer-v2 enableorderby="0" type="nullSymbol" symbollevels="0" referencescale="-1" forceraster="0"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="50" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="0.75" fieldName="name" useSubstitutions="0" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="8.5" namedStyle="Regular" forcedItalic="0" isExpression="0" fontSizeUnit="Point" allowHtml="0" legendString="Aa">
+          <text-style textOpacity="0.75" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="Regular" fontUnderline="0" fieldName="name" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" useSubstitutions="0" fontWeight="50" fontStrikeout="0" fontItalic="0" fontSize="8.5" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" isExpression="0" legendString="Aa" textOrientation="horizontal">
             <families/>
-            <text-buffer bufferNoFill="0" bufferBlendMode="0" bufferSize="1.5" bufferJoinStyle="64" bufferDraw="1" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="0.59999999999999998" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="0"/>
-            <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeBorderWidth="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-              <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <text-buffer bufferNoFill="0" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1.5" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="0.59999999999999998"/>
+            <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskType="0"/>
+            <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
+              <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                    <Option value="255,255,255,255" type="QString" name="color"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                    <Option value="no" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="solid" type="QString" name="style"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                    <Option type="QString" value="255,255,255,255" name="color"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                    <Option type="QString" value="no" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="solid" name="style"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -17634,109 +17636,109 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+            <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option type="Map" name="properties">
                   <Option type="Map" name="LabelRotation">
-                    <Option value="true" type="bool" name="active"/>
-                    <Option value="360 - (&quot;label_rota&quot;)" type="QString" name="expression"/>
-                    <Option value="3" type="int" name="type"/>
+                    <Option type="bool" value="true" name="active"/>
+                    <Option type="QString" value="360 - (&quot;label_rota&quot;)" name="expression"/>
+                    <Option type="int" value="3" name="type"/>
                   </Option>
                   <Option type="Map" name="PositionX">
-                    <Option value="true" type="bool" name="active"/>
-                    <Option value="label_x" type="QString" name="field"/>
-                    <Option value="2" type="int" name="type"/>
+                    <Option type="bool" value="true" name="active"/>
+                    <Option type="QString" value="label_x" name="field"/>
+                    <Option type="int" value="2" name="type"/>
                   </Option>
                   <Option type="Map" name="PositionY">
-                    <Option value="true" type="bool" name="active"/>
-                    <Option value="label_y" type="QString" name="field"/>
-                    <Option value="2" type="int" name="type"/>
+                    <Option type="bool" value="true" name="active"/>
+                    <Option type="QString" value="label_y" name="field"/>
+                    <Option type="int" value="2" name="type"/>
                   </Option>
                   <Option type="Map" name="Size">
-                    <Option value="true" type="bool" name="active"/>
-                    <Option value="if ('marshal' = attribute( $atlasfeature , 'type' ), '11', '9' )" type="QString" name="expression"/>
-                    <Option value="3" type="int" name="type"/>
+                    <Option type="bool" value="true" name="active"/>
+                    <Option type="QString" value="if ('marshal' = attribute( $atlasfeature , 'type' ), '11', '9' )" name="expression"/>
+                    <Option type="int" value="3" name="type"/>
                   </Option>
                 </Option>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format useMaxLineLengthForAutoWrap="1" leftDirectionSymbol="&lt;" wrapChar="" multilineAlign="0" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" decimals="3" rightDirectionSymbol=">" formatNumbers="0"/>
-          <placement overlapHandling="PreventOverlap" lineAnchorType="0" centroidInside="0" overrunDistance="0" centroidWhole="0" geometryGeneratorEnabled="0" rotationAngle="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" geometryGeneratorType="PointGeometry" quadOffset="4" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="6" xOffset="0" allowDegraded="0" lineAnchorTextPoint="CenterOfText" layerType="UnknownGeometry" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" maxCurvedCharAngleOut="-20" repeatDistance="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" dist="0" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" distUnits="MM" lineAnchorClipping="0" placementFlags="2" priority="1" overrunDistanceUnit="MM" maxCurvedCharAngleIn="20" geometryGenerator="" lineAnchorPercent="0.5" yOffset="0" rotationUnit="AngleDegrees"/>
-          <rendering fontMaxPixelSize="10000" drawLabels="1" mergeLines="0" zIndex="0" upsidedownLabels="0" obstacleFactor="0.20000000000000001" scaleVisibility="0" limitNumLabels="0" obstacleType="0" fontLimitPixelSize="0" maxNumLabels="2000" minFeatureSize="0" fontMinPixelSize="3" labelPerPart="0" obstacle="1" scaleMax="10000000" scaleMin="1" unplacedVisibility="0"/>
+          <text-format wrapChar="" rightDirectionSymbol=">" plussign="0" leftDirectionSymbol="&lt;" formatNumbers="0" decimals="3" multilineAlign="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
+          <placement offsetUnits="MapUnit" xOffset="0" maxCurvedCharAngleOut="-20" layerType="UnknownGeometry" allowDegraded="0" yOffset="0" overlapHandling="PreventOverlap" geometryGeneratorType="PointGeometry" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" repeatDistanceUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" quadOffset="4" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidWhole="0" overrunDistance="0" overrunDistanceUnit="MM" centroidInside="0" placement="6" geometryGenerator="" priority="1" distUnits="MM" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" dist="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorTextPoint="CenterOfText" polygonPlacementFlags="2" rotationUnit="AngleDegrees" offsetType="0" placementFlags="2" repeatDistance="0"/>
+          <rendering limitNumLabels="0" obstacleType="0" obstacle="1" scaleMax="10000000" maxNumLabels="2000" labelPerPart="0" scaleMin="1" upsidedownLabels="0" zIndex="0" unplacedVisibility="0" fontLimitPixelSize="0" minFeatureSize="0" fontMaxPixelSize="10000" scaleVisibility="0" fontMinPixelSize="3" drawLabels="1" mergeLines="0" obstacleFactor="0.20000000000000001"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="LabelRotation">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="360 - (&quot;label_rota&quot;)" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="360 - (&quot;label_rota&quot;)" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
                 <Option type="Map" name="PositionX">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="label_x" type="QString" name="field"/>
-                  <Option value="2" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="label_x" name="field"/>
+                  <Option type="int" value="2" name="type"/>
                 </Option>
                 <Option type="Map" name="PositionY">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="label_y" type="QString" name="field"/>
-                  <Option value="2" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="label_y" name="field"/>
+                  <Option type="int" value="2" name="type"/>
                 </Option>
                 <Option type="Map" name="Size">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="if ('marshal' = attribute( $atlasfeature , 'type' ), '11', '9' )" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="if ('marshal' = attribute( $atlasfeature , 'type' ), '11', '9' )" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-              <Option value="0" type="int" name="blendMode"/>
+              <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+              <Option type="int" value="0" name="blendMode"/>
               <Option type="Map" name="ddProperties">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
-              <Option value="false" type="bool" name="drawToAllParts"/>
-              <Option value="0" type="QString" name="enabled"/>
-              <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-              <Option value="&lt;symbol is_animated=&quot;0&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-              <Option value="0" type="double" name="minLength"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-              <Option value="MM" type="QString" name="minLengthUnit"/>
-              <Option value="0" type="double" name="offsetFromAnchor"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-              <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-              <Option value="0" type="double" name="offsetFromLabel"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-              <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+              <Option type="bool" value="false" name="drawToAllParts"/>
+              <Option type="QString" value="0" name="enabled"/>
+              <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
+              <Option type="QString" value="&lt;symbol alpha=&quot;1&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
+              <Option type="double" value="0" name="minLength"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
+              <Option type="QString" value="MM" name="minLengthUnit"/>
+              <Option type="double" value="0" name="offsetFromAnchor"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
+              <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
+              <Option type="double" value="0" name="offsetFromLabel"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
+              <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option value="&quot;name&quot;" type="QString" name="dualview/previewExpressions"/>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="QString" value="copy" name="QFieldSync/action"/>
+          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="&quot;name&quot;" name="dualview/previewExpressions"/>
+          <Option type="QString" value="0" name="embeddedWidgets/count"/>
           <Option type="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -17744,48 +17746,48 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory penAlpha="255" width="15" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" minimumSize="0" enabled="0" maxScaleDenominator="1e+08" diagramOrientation="Up" opacity="1" scaleBasedVisibility="0" spacingUnit="MM" minScaleDenominator="100000" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" lineSizeType="MM" penWidth="0" backgroundAlpha="255" scaleDependency="Area" spacing="0" direction="1" barWidth="5" sizeType="MM" height="15" penColor="#000000" showAxis="0">
-          <fontProperties bold="0" style="" italic="0" description="Arial,10,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0"/>
-          <attribute label="" colorOpacity="1" field="" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory height="15" scaleDependency="Area" width="15" lineSizeScale="3x:0,0,0,0,0,0" spacingUnit="MM" lineSizeType="MM" penColor="#000000" spacing="0" labelPlacementMethod="XHeight" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" backgroundAlpha="255" maxScaleDenominator="1e+08" barWidth="5" penWidth="0" minimumSize="0" penAlpha="255" minScaleDenominator="100000" sizeType="MM" backgroundColor="#ffffff" enabled="0" opacity="1" direction="1" scaleBasedVisibility="0" showAxis="0" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270">
+          <fontProperties style="" description="Arial,10,-1,5,50,0,0,0,0,0" strikethrough="0" italic="0" underline="0" bold="0"/>
+          <attribute color="#000000" field="" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="35,35,35,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0.26" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -17816,9 +17818,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -17826,28 +17828,28 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="2" showAll="1" placement="0" zIndex="0" dist="0" priority="0" obstacle="0">
+      <DiagramLayerSettings priority="0" linePlacementFlags="2" obstacle="0" dist="0" zIndex="0" placement="0" showAll="1">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field configurationFlags="None" name="id">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -17856,8 +17858,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -17866,8 +17868,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -17876,8 +17878,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -17886,8 +17888,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -17896,8 +17898,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -17906,8 +17908,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -17916,8 +17918,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -17926,73 +17928,73 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
-        <alias index="1" name="" field="osm_id"/>
-        <alias index="2" name="" field="name"/>
-        <alias index="3" name="" field="type"/>
-        <alias index="4" name="" field="z_order"/>
-        <alias index="5" name="" field="population"/>
-        <alias index="6" name="" field="label_x"/>
-        <alias index="7" name="" field="label_y"/>
-        <alias index="8" name="" field="label_rota"/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="osm_id" name=""/>
+        <alias index="2" field="name" name=""/>
+        <alias index="3" field="type" name=""/>
+        <alias index="4" field="z_order" name=""/>
+        <alias index="5" field="population" name=""/>
+        <alias index="6" field="label_x" name=""/>
+        <alias index="7" field="label_y" name=""/>
+        <alias index="8" field="label_rota" name=""/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="osm_id"/>
-        <default applyOnUpdate="0" expression="" field="name"/>
-        <default applyOnUpdate="0" expression="" field="type"/>
-        <default applyOnUpdate="0" expression="" field="z_order"/>
-        <default applyOnUpdate="0" expression="" field="population"/>
-        <default applyOnUpdate="0" expression="" field="label_x"/>
-        <default applyOnUpdate="0" expression="" field="label_y"/>
-        <default applyOnUpdate="0" expression="" field="label_rota"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="osm_id" expression=""/>
+        <default applyOnUpdate="0" field="name" expression=""/>
+        <default applyOnUpdate="0" field="type" expression=""/>
+        <default applyOnUpdate="0" field="z_order" expression=""/>
+        <default applyOnUpdate="0" field="population" expression=""/>
+        <default applyOnUpdate="0" field="label_x" expression=""/>
+        <default applyOnUpdate="0" field="label_y" expression=""/>
+        <default applyOnUpdate="0" field="label_rota" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="id" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="osm_id" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="name" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="type" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="z_order" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="population" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="label_x" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="label_y" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="label_rota" constraints="0"/>
+        <constraint exp_strength="0" field="id" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="osm_id" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="name" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="type" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="z_order" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="population" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="label_x" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="label_y" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="label_rota" notnull_strength="0" constraints="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" desc="" field="id"/>
-        <constraint exp="" desc="" field="osm_id"/>
-        <constraint exp="" desc="" field="name"/>
-        <constraint exp="" desc="" field="type"/>
-        <constraint exp="" desc="" field="z_order"/>
-        <constraint exp="" desc="" field="population"/>
-        <constraint exp="" desc="" field="label_x"/>
-        <constraint exp="" desc="" field="label_y"/>
-        <constraint exp="" desc="" field="label_rota"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="osm_id" desc=""/>
+        <constraint exp="" field="name" desc=""/>
+        <constraint exp="" field="type" desc=""/>
+        <constraint exp="" field="z_order" desc=""/>
+        <constraint exp="" field="population" desc=""/>
+        <constraint exp="" field="label_x" desc=""/>
+        <constraint exp="" field="label_y" desc=""/>
+        <constraint exp="" field="label_rota" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column width="-1" type="field" name="id" hidden="0"/>
-          <column width="-1" type="field" name="osm_id" hidden="0"/>
-          <column width="-1" type="field" name="name" hidden="0"/>
-          <column width="-1" type="field" name="type" hidden="0"/>
-          <column width="-1" type="field" name="z_order" hidden="0"/>
-          <column width="-1" type="field" name="population" hidden="0"/>
+          <column width="-1" type="field" hidden="0" name="id"/>
+          <column width="-1" type="field" hidden="0" name="osm_id"/>
+          <column width="-1" type="field" hidden="0" name="name"/>
+          <column width="-1" type="field" hidden="0" name="type"/>
+          <column width="-1" type="field" hidden="0" name="z_order"/>
+          <column width="-1" type="field" hidden="0" name="population"/>
           <column width="-1" type="actions" hidden="1"/>
-          <column width="-1" type="field" name="label_x" hidden="0"/>
-          <column width="-1" type="field" name="label_y" hidden="0"/>
-          <column width="-1" type="field" name="label_rota" hidden="0"/>
+          <column width="-1" type="field" hidden="0" name="label_x"/>
+          <column width="-1" type="field" hidden="0" name="label_y"/>
+          <column width="-1" type="field" hidden="0" name="label_rota"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -18024,26 +18026,26 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="id" editable="1"/>
-        <field name="label_rota" editable="1"/>
-        <field name="label_x" editable="1"/>
-        <field name="label_y" editable="1"/>
-        <field name="name" editable="1"/>
-        <field name="osm_id" editable="1"/>
-        <field name="population" editable="1"/>
-        <field name="type" editable="1"/>
-        <field name="z_order" editable="1"/>
+        <field editable="1" name="id"/>
+        <field editable="1" name="label_rota"/>
+        <field editable="1" name="label_x"/>
+        <field editable="1" name="label_y"/>
+        <field editable="1" name="name"/>
+        <field editable="1" name="osm_id"/>
+        <field editable="1" name="population"/>
+        <field editable="1" name="type"/>
+        <field editable="1" name="z_order"/>
       </editable>
       <labelOnTop>
-        <field name="id" labelOnTop="0"/>
-        <field name="label_rota" labelOnTop="0"/>
-        <field name="label_x" labelOnTop="0"/>
-        <field name="label_y" labelOnTop="0"/>
-        <field name="name" labelOnTop="0"/>
-        <field name="osm_id" labelOnTop="0"/>
-        <field name="population" labelOnTop="0"/>
-        <field name="type" labelOnTop="0"/>
-        <field name="z_order" labelOnTop="0"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="label_rota"/>
+        <field labelOnTop="0" name="label_x"/>
+        <field labelOnTop="0" name="label_y"/>
+        <field labelOnTop="0" name="name"/>
+        <field labelOnTop="0" name="osm_id"/>
+        <field labelOnTop="0" name="population"/>
+        <field labelOnTop="0" name="type"/>
+        <field labelOnTop="0" name="z_order"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -18051,7 +18053,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" simplifyLocal="1" autoRefreshTime="0" wkbType="MultiLineString" simplifyDrawingHints="0" type="vector" symbologyReferenceScale="-1" minScale="100000000" legendPlaceholderImage="" refreshOnNotifyEnabled="0" labelsEnabled="1" maxScale="100000" styleCategories="AllStyleCategories" simplifyAlgorithm="0" refreshOnNotifyMessage="" readOnly="0" geometry="Line" autoRefreshEnabled="0" simplifyDrawingTol="1">
+    <maplayer simplifyLocal="1" simplifyDrawingHints="0" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1" legendPlaceholderImage="" symbologyReferenceScale="-1" readOnly="0" refreshOnNotifyEnabled="0" minScale="100000000" maxScale="100000" type="vector" autoRefreshTime="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="1" styleCategories="AllStyleCategories" geometry="Line" autoRefreshEnabled="0" wkbType="MultiLineString">
       <extent>
         <xmin>18.3437671999999985</xmin>
         <ymin>-34.02801110000000051</ymin>
@@ -18116,7 +18118,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxy="0" minz="0" dimensions="2" maxx="0" maxz="0" miny="0" minx="0" crs=""/>
+          <spatial maxz="0" minx="0" maxx="0" minz="0" crs="" miny="0" maxy="0" dimensions="2"/>
           <temporal>
             <period>
               <start></start>
@@ -18141,58 +18143,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" startExpression="" mode="0" limitMode="0" endField="" fixedDuration="0" accumulate="0" durationUnit="min" startField="" endExpression="" enabled="0">
+      <temporal durationField="" fixedDuration="0" accumulate="0" endField="" startField="" enabled="0" startExpression="" endExpression="" durationUnit="min" mode="0" limitMode="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" zscale="1" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" binding="Centroid" type="IndividualFeatures" symbology="Line" extrusion="0" zoffset="0">
+      <elevation extrusionEnabled="0" symbology="Line" type="IndividualFeatures" zscale="1" clamping="Terrain" showMarkerSymbolInSurfacePlots="0" zoffset="0" extrusion="0" respectLayerSymbol="1" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="255,158,23,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="255,158,23,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -18223,36 +18225,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="255,158,23,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="182,113,16,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="255,158,23,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="182,113,16,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,158,23,255"/>
@@ -18267,44 +18269,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="255,158,23,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="182,113,16,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="255,158,23,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="diamond" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="182,113,16,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="3" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -18327,52 +18329,52 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" type="nullSymbol" symbollevels="0" referencescale="-1" enableorderby="0"/>
+      <renderer-v2 enableorderby="0" type="nullSymbol" symbollevels="0" referencescale="-1" forceraster="0"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="50" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="0.80000000000000004" fieldName="if( &quot;never_show&quot;, '', &quot;name&quot; )" useSubstitutions="0" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="7" namedStyle="Regular" forcedItalic="0" isExpression="1" fontSizeUnit="Point" allowHtml="0" legendString="Aa">
+          <text-style textOpacity="0.80000000000000004" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="Regular" fontUnderline="0" fieldName="if( &quot;never_show&quot;, '', &quot;name&quot; )" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" useSubstitutions="0" fontWeight="50" fontStrikeout="0" fontItalic="0" fontSize="7" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" isExpression="1" legendString="Aa" textOrientation="horizontal">
             <families/>
-            <text-buffer bufferNoFill="0" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferDraw="1" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="0.59999999999999998" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="0"/>
-            <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeBorderWidth="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-              <symbol is_animated="0" type="marker" name="markerSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <text-buffer bufferNoFill="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="0.59999999999999998"/>
+            <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskType="0"/>
+            <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
+              <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="markerSymbol">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="196,60,57,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="square" name="cap_style"/>
+                    <Option type="QString" value="196,60,57,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="circle" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                    <Option type="QString" value="solid" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -18395,34 +18397,34 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
-              <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+              <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                    <Option value="255,255,255,255" type="QString" name="color"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                    <Option value="no" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="solid" type="QString" name="style"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                    <Option type="QString" value="255,255,255,255" name="color"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                    <Option type="QString" value="no" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="solid" name="style"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -18437,116 +18439,116 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+            <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format useMaxLineLengthForAutoWrap="1" leftDirectionSymbol="&lt;" wrapChar="" multilineAlign="0" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" decimals="3" rightDirectionSymbol=">" formatNumbers="0"/>
-          <placement overlapHandling="PreventOverlap" lineAnchorType="0" centroidInside="0" overrunDistance="0" centroidWhole="0" geometryGeneratorEnabled="0" rotationAngle="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" geometryGeneratorType="PointGeometry" quadOffset="4" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="3" xOffset="0" allowDegraded="0" lineAnchorTextPoint="CenterOfText" layerType="LineGeometry" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" maxCurvedCharAngleOut="-20" repeatDistance="0" offsetUnits="MapUnit" repeatDistanceUnits="MapUnit" dist="0" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" distUnits="MM" lineAnchorClipping="0" placementFlags="4" priority="3" overrunDistanceUnit="MM" maxCurvedCharAngleIn="20" geometryGenerator="" lineAnchorPercent="0.5" yOffset="0" rotationUnit="AngleDegrees"/>
-          <rendering fontMaxPixelSize="10000" drawLabels="1" mergeLines="1" zIndex="0" upsidedownLabels="0" obstacleFactor="0.29999999999999999" scaleVisibility="0" limitNumLabels="0" obstacleType="0" fontLimitPixelSize="0" maxNumLabels="2000" minFeatureSize="5" fontMinPixelSize="3" labelPerPart="0" obstacle="1" scaleMax="10000000" scaleMin="1" unplacedVisibility="0"/>
+          <text-format wrapChar="" rightDirectionSymbol=">" plussign="0" leftDirectionSymbol="&lt;" formatNumbers="0" decimals="3" multilineAlign="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
+          <placement offsetUnits="MapUnit" xOffset="0" maxCurvedCharAngleOut="-20" layerType="LineGeometry" allowDegraded="0" yOffset="0" overlapHandling="PreventOverlap" geometryGeneratorType="PointGeometry" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" repeatDistanceUnits="MapUnit" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" quadOffset="4" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidWhole="0" overrunDistance="0" overrunDistanceUnit="MM" centroidInside="0" placement="3" geometryGenerator="" priority="3" distUnits="MM" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" dist="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorTextPoint="CenterOfText" polygonPlacementFlags="2" rotationUnit="AngleDegrees" offsetType="0" placementFlags="4" repeatDistance="0"/>
+          <rendering limitNumLabels="0" obstacleType="0" obstacle="1" scaleMax="10000000" maxNumLabels="2000" labelPerPart="0" scaleMin="1" upsidedownLabels="0" zIndex="0" unplacedVisibility="0" fontLimitPixelSize="0" minFeatureSize="5" fontMaxPixelSize="10000" scaleVisibility="0" fontMinPixelSize="3" drawLabels="1" mergeLines="1" obstacleFactor="0.29999999999999999"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="AlwaysShow">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="always_sho" type="QString" name="field"/>
-                  <Option value="2" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="always_sho" name="field"/>
+                  <Option type="int" value="2" name="type"/>
                 </Option>
                 <Option type="Map" name="IsObstacle">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="&quot;&quot;" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="&quot;&quot;" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
                 <Option type="Map" name="LabelRotation">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="360 - (&quot;label_rota&quot;)" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="360 - (&quot;label_rota&quot;)" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
                 <Option type="Map" name="PositionX">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="label_x" type="QString" name="field"/>
-                  <Option value="2" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="label_x" name="field"/>
+                  <Option type="int" value="2" name="type"/>
                 </Option>
                 <Option type="Map" name="PositionY">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="label_y" type="QString" name="field"/>
-                  <Option value="2" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="label_y" name="field"/>
+                  <Option type="int" value="2" name="type"/>
                 </Option>
                 <Option type="Map" name="Priority">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="1" type="int" name="type"/>
-                  <Option value="" type="QString" name="val"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="int" value="1" name="type"/>
+                  <Option type="QString" value="" name="val"/>
                 </Option>
                 <Option type="Map" name="Show">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="auxiliary_storage_labeling_show" type="QString" name="field"/>
-                  <Option value="2" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="auxiliary_storage_labeling_show" name="field"/>
+                  <Option type="int" value="2" name="type"/>
                 </Option>
                 <Option type="Map" name="Size">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="if ('marshal' = attribute( @atlas_feature, 'type' ), '10', '8' )" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="if ('marshal' = attribute( @atlas_feature, 'type' ), '10', '8' )" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-              <Option value="0" type="int" name="blendMode"/>
+              <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+              <Option type="int" value="0" name="blendMode"/>
               <Option type="Map" name="ddProperties">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
-              <Option value="false" type="bool" name="drawToAllParts"/>
-              <Option value="0" type="QString" name="enabled"/>
-              <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-              <Option value="&lt;symbol is_animated=&quot;0&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-              <Option value="0" type="double" name="minLength"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-              <Option value="MM" type="QString" name="minLengthUnit"/>
-              <Option value="0" type="double" name="offsetFromAnchor"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-              <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-              <Option value="0" type="double" name="offsetFromLabel"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-              <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+              <Option type="bool" value="false" name="drawToAllParts"/>
+              <Option type="QString" value="0" name="enabled"/>
+              <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
+              <Option type="QString" value="&lt;symbol alpha=&quot;1&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
+              <Option type="double" value="0" name="minLength"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
+              <Option type="QString" value="MM" name="minLengthUnit"/>
+              <Option type="double" value="0" name="offsetFromAnchor"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
+              <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
+              <Option type="double" value="0" name="offsetFromLabel"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
+              <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="copy" name="QFieldSync/action"/>
+          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
           <Option type="List" name="dualview/previewExpressions">
-            <Option value="COALESCE( &quot;name&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;name&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;name&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;name&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;name&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;name&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;name&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option type="QString" value="COALESCE( &quot;name&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;name&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;name&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;name&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;name&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;name&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;name&quot;, '&lt;NULL>' )"/>
           </Option>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="QString" value="0" name="embeddedWidgets/count"/>
           <Option type="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -18554,48 +18556,48 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory penAlpha="255" width="15" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" minimumSize="0" enabled="0" maxScaleDenominator="1e+08" diagramOrientation="Up" opacity="1" scaleBasedVisibility="0" spacingUnit="MM" minScaleDenominator="100000" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" lineSizeType="MM" penWidth="0" backgroundAlpha="255" scaleDependency="Area" spacing="0" direction="1" barWidth="5" sizeType="MM" height="15" penColor="#000000" showAxis="0">
-          <fontProperties bold="0" style="" italic="0" description="Arial,10,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0"/>
-          <attribute label="" colorOpacity="1" field="" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory height="15" scaleDependency="Area" width="15" lineSizeScale="3x:0,0,0,0,0,0" spacingUnit="MM" lineSizeType="MM" penColor="#000000" spacing="0" labelPlacementMethod="XHeight" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" backgroundAlpha="255" maxScaleDenominator="1e+08" barWidth="5" penWidth="0" minimumSize="0" penAlpha="255" minScaleDenominator="100000" sizeType="MM" backgroundColor="#ffffff" enabled="0" opacity="1" direction="1" scaleBasedVisibility="0" showAxis="0" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270">
+          <fontProperties style="" description="Arial,10,-1,5,50,0,0,0,0,0" strikethrough="0" italic="0" underline="0" bold="0"/>
+          <attribute color="#000000" field="" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="35,35,35,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0.26" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -18626,9 +18628,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -18636,28 +18638,28 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="2" showAll="1" placement="2" zIndex="0" dist="0" priority="0" obstacle="0">
+      <DiagramLayerSettings priority="0" linePlacementFlags="2" obstacle="0" dist="0" zIndex="0" placement="2" showAll="1">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field configurationFlags="None" name="osm_id">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -18666,8 +18668,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -18711,8 +18713,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -18775,100 +18777,100 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="osm_id"/>
-        <alias index="1" name="" field="name"/>
-        <alias index="2" name="" field="highway"/>
-        <alias index="3" name="" field="waterway"/>
-        <alias index="4" name="" field="aerialway"/>
-        <alias index="5" name="" field="barrier"/>
-        <alias index="6" name="" field="man_made"/>
-        <alias index="7" name="" field="z_order"/>
-        <alias index="8" name="" field="other_tags"/>
-        <alias index="9" name="" field="never_show"/>
-        <alias index="10" name="" field="label_x"/>
-        <alias index="11" name="" field="label_y"/>
-        <alias index="12" name="" field="label_rota"/>
-        <alias index="13" name="" field="always_sho"/>
-        <alias index="14" name="" field="resident_a"/>
-        <alias index="15" name="" field="auxiliary_storage_labeling_show"/>
+        <alias index="0" field="osm_id" name=""/>
+        <alias index="1" field="name" name=""/>
+        <alias index="2" field="highway" name=""/>
+        <alias index="3" field="waterway" name=""/>
+        <alias index="4" field="aerialway" name=""/>
+        <alias index="5" field="barrier" name=""/>
+        <alias index="6" field="man_made" name=""/>
+        <alias index="7" field="z_order" name=""/>
+        <alias index="8" field="other_tags" name=""/>
+        <alias index="9" field="never_show" name=""/>
+        <alias index="10" field="label_x" name=""/>
+        <alias index="11" field="label_y" name=""/>
+        <alias index="12" field="label_rota" name=""/>
+        <alias index="13" field="always_sho" name=""/>
+        <alias index="14" field="resident_a" name=""/>
+        <alias index="15" field="auxiliary_storage_labeling_show" name=""/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="osm_id"/>
-        <default applyOnUpdate="0" expression="" field="name"/>
-        <default applyOnUpdate="0" expression="" field="highway"/>
-        <default applyOnUpdate="0" expression="" field="waterway"/>
-        <default applyOnUpdate="0" expression="" field="aerialway"/>
-        <default applyOnUpdate="0" expression="" field="barrier"/>
-        <default applyOnUpdate="0" expression="" field="man_made"/>
-        <default applyOnUpdate="0" expression="" field="z_order"/>
-        <default applyOnUpdate="0" expression="" field="other_tags"/>
-        <default applyOnUpdate="0" expression="" field="never_show"/>
-        <default applyOnUpdate="0" expression="" field="label_x"/>
-        <default applyOnUpdate="0" expression="" field="label_y"/>
-        <default applyOnUpdate="0" expression="" field="label_rota"/>
-        <default applyOnUpdate="0" expression="" field="always_sho"/>
-        <default applyOnUpdate="0" expression="" field="resident_a"/>
-        <default applyOnUpdate="0" expression="" field="auxiliary_storage_labeling_show"/>
+        <default applyOnUpdate="0" field="osm_id" expression=""/>
+        <default applyOnUpdate="0" field="name" expression=""/>
+        <default applyOnUpdate="0" field="highway" expression=""/>
+        <default applyOnUpdate="0" field="waterway" expression=""/>
+        <default applyOnUpdate="0" field="aerialway" expression=""/>
+        <default applyOnUpdate="0" field="barrier" expression=""/>
+        <default applyOnUpdate="0" field="man_made" expression=""/>
+        <default applyOnUpdate="0" field="z_order" expression=""/>
+        <default applyOnUpdate="0" field="other_tags" expression=""/>
+        <default applyOnUpdate="0" field="never_show" expression=""/>
+        <default applyOnUpdate="0" field="label_x" expression=""/>
+        <default applyOnUpdate="0" field="label_y" expression=""/>
+        <default applyOnUpdate="0" field="label_rota" expression=""/>
+        <default applyOnUpdate="0" field="always_sho" expression=""/>
+        <default applyOnUpdate="0" field="resident_a" expression=""/>
+        <default applyOnUpdate="0" field="auxiliary_storage_labeling_show" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="osm_id" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="name" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="highway" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="waterway" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="aerialway" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="barrier" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="man_made" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="z_order" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="other_tags" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="never_show" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="label_x" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="label_y" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="label_rota" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="always_sho" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="resident_a" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="auxiliary_storage_labeling_show" constraints="0"/>
+        <constraint exp_strength="0" field="osm_id" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="name" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="highway" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="waterway" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="aerialway" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="barrier" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="man_made" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="z_order" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="other_tags" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="never_show" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="label_x" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="label_y" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="label_rota" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="always_sho" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="resident_a" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="auxiliary_storage_labeling_show" notnull_strength="0" constraints="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" desc="" field="osm_id"/>
-        <constraint exp="" desc="" field="name"/>
-        <constraint exp="" desc="" field="highway"/>
-        <constraint exp="" desc="" field="waterway"/>
-        <constraint exp="" desc="" field="aerialway"/>
-        <constraint exp="" desc="" field="barrier"/>
-        <constraint exp="" desc="" field="man_made"/>
-        <constraint exp="" desc="" field="z_order"/>
-        <constraint exp="" desc="" field="other_tags"/>
-        <constraint exp="" desc="" field="never_show"/>
-        <constraint exp="" desc="" field="label_x"/>
-        <constraint exp="" desc="" field="label_y"/>
-        <constraint exp="" desc="" field="label_rota"/>
-        <constraint exp="" desc="" field="always_sho"/>
-        <constraint exp="" desc="" field="resident_a"/>
-        <constraint exp="" desc="" field="auxiliary_storage_labeling_show"/>
+        <constraint exp="" field="osm_id" desc=""/>
+        <constraint exp="" field="name" desc=""/>
+        <constraint exp="" field="highway" desc=""/>
+        <constraint exp="" field="waterway" desc=""/>
+        <constraint exp="" field="aerialway" desc=""/>
+        <constraint exp="" field="barrier" desc=""/>
+        <constraint exp="" field="man_made" desc=""/>
+        <constraint exp="" field="z_order" desc=""/>
+        <constraint exp="" field="other_tags" desc=""/>
+        <constraint exp="" field="never_show" desc=""/>
+        <constraint exp="" field="label_x" desc=""/>
+        <constraint exp="" field="label_y" desc=""/>
+        <constraint exp="" field="label_rota" desc=""/>
+        <constraint exp="" field="always_sho" desc=""/>
+        <constraint exp="" field="resident_a" desc=""/>
+        <constraint exp="" field="auxiliary_storage_labeling_show" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="&quot;osm_id&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="&quot;osm_id&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column width="-1" type="field" name="osm_id" hidden="0"/>
-          <column width="160" type="field" name="name" hidden="0"/>
-          <column width="-1" type="field" name="z_order" hidden="0"/>
+          <column width="-1" type="field" hidden="0" name="osm_id"/>
+          <column width="160" type="field" hidden="0" name="name"/>
+          <column width="-1" type="field" hidden="0" name="z_order"/>
           <column width="-1" type="actions" hidden="1"/>
-          <column width="-1" type="field" name="highway" hidden="0"/>
-          <column width="-1" type="field" name="waterway" hidden="0"/>
-          <column width="-1" type="field" name="aerialway" hidden="0"/>
-          <column width="-1" type="field" name="barrier" hidden="0"/>
-          <column width="-1" type="field" name="man_made" hidden="0"/>
-          <column width="142" type="field" name="other_tags" hidden="0"/>
-          <column width="-1" type="field" name="never_show" hidden="0"/>
-          <column width="-1" type="field" name="label_x" hidden="0"/>
-          <column width="-1" type="field" name="label_y" hidden="0"/>
-          <column width="-1" type="field" name="label_rota" hidden="0"/>
-          <column width="-1" type="field" name="always_sho" hidden="0"/>
-          <column width="-1" type="field" name="resident_a" hidden="0"/>
-          <column width="-1" type="field" name="auxiliary_storage_labeling_show" hidden="0"/>
+          <column width="-1" type="field" hidden="0" name="highway"/>
+          <column width="-1" type="field" hidden="0" name="waterway"/>
+          <column width="-1" type="field" hidden="0" name="aerialway"/>
+          <column width="-1" type="field" hidden="0" name="barrier"/>
+          <column width="-1" type="field" hidden="0" name="man_made"/>
+          <column width="142" type="field" hidden="0" name="other_tags"/>
+          <column width="-1" type="field" hidden="0" name="never_show"/>
+          <column width="-1" type="field" hidden="0" name="label_x"/>
+          <column width="-1" type="field" hidden="0" name="label_y"/>
+          <column width="-1" type="field" hidden="0" name="label_rota"/>
+          <column width="-1" type="field" hidden="0" name="always_sho"/>
+          <column width="-1" type="field" hidden="0" name="resident_a"/>
+          <column width="-1" type="field" hidden="0" name="auxiliary_storage_labeling_show"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -18900,94 +18902,94 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="aerialway" editable="1"/>
-        <field name="always_sho" editable="1"/>
-        <field name="auxiliary_storage_labeling_show" editable="0"/>
-        <field name="barrier" editable="1"/>
-        <field name="highway" editable="1"/>
-        <field name="label_rota" editable="1"/>
-        <field name="label_x" editable="1"/>
-        <field name="label_y" editable="1"/>
-        <field name="man_made" editable="1"/>
-        <field name="name" editable="1"/>
-        <field name="never_show" editable="1"/>
-        <field name="orig_access" editable="0"/>
-        <field name="orig_always_sho" editable="0"/>
-        <field name="orig_bridge" editable="0"/>
-        <field name="orig_c_z_order" editable="0"/>
-        <field name="orig_class" editable="0"/>
-        <field name="orig_id" editable="0"/>
-        <field name="orig_label_rota" editable="0"/>
-        <field name="orig_label_x" editable="0"/>
-        <field name="orig_label_y" editable="0"/>
-        <field name="orig_name" editable="0"/>
-        <field name="orig_oneway" editable="0"/>
-        <field name="orig_ref" editable="0"/>
-        <field name="orig_service" editable="0"/>
-        <field name="orig_show" editable="0"/>
-        <field name="orig_tunnel" editable="0"/>
-        <field name="orig_type" editable="0"/>
-        <field name="orig_z_order" editable="0"/>
-        <field name="osm_id" editable="1"/>
-        <field name="other_tags" editable="1"/>
-        <field name="resident_a" editable="1"/>
-        <field name="resident_access" editable="1"/>
-        <field name="waterway" editable="1"/>
-        <field name="z_order" editable="1"/>
+        <field editable="1" name="aerialway"/>
+        <field editable="1" name="always_sho"/>
+        <field editable="0" name="auxiliary_storage_labeling_show"/>
+        <field editable="1" name="barrier"/>
+        <field editable="1" name="highway"/>
+        <field editable="1" name="label_rota"/>
+        <field editable="1" name="label_x"/>
+        <field editable="1" name="label_y"/>
+        <field editable="1" name="man_made"/>
+        <field editable="1" name="name"/>
+        <field editable="1" name="never_show"/>
+        <field editable="0" name="orig_access"/>
+        <field editable="0" name="orig_always_sho"/>
+        <field editable="0" name="orig_bridge"/>
+        <field editable="0" name="orig_c_z_order"/>
+        <field editable="0" name="orig_class"/>
+        <field editable="0" name="orig_id"/>
+        <field editable="0" name="orig_label_rota"/>
+        <field editable="0" name="orig_label_x"/>
+        <field editable="0" name="orig_label_y"/>
+        <field editable="0" name="orig_name"/>
+        <field editable="0" name="orig_oneway"/>
+        <field editable="0" name="orig_ref"/>
+        <field editable="0" name="orig_service"/>
+        <field editable="0" name="orig_show"/>
+        <field editable="0" name="orig_tunnel"/>
+        <field editable="0" name="orig_type"/>
+        <field editable="0" name="orig_z_order"/>
+        <field editable="1" name="osm_id"/>
+        <field editable="1" name="other_tags"/>
+        <field editable="1" name="resident_a"/>
+        <field editable="1" name="resident_access"/>
+        <field editable="1" name="waterway"/>
+        <field editable="1" name="z_order"/>
       </editable>
       <labelOnTop>
-        <field name="aerialway" labelOnTop="0"/>
-        <field name="always_sho" labelOnTop="0"/>
-        <field name="auxiliary_storage_labeling_show" labelOnTop="0"/>
-        <field name="barrier" labelOnTop="0"/>
-        <field name="highway" labelOnTop="0"/>
-        <field name="label_rota" labelOnTop="0"/>
-        <field name="label_x" labelOnTop="0"/>
-        <field name="label_y" labelOnTop="0"/>
-        <field name="man_made" labelOnTop="0"/>
-        <field name="name" labelOnTop="0"/>
-        <field name="never_show" labelOnTop="0"/>
-        <field name="orig_access" labelOnTop="0"/>
-        <field name="orig_always_sho" labelOnTop="0"/>
-        <field name="orig_bridge" labelOnTop="0"/>
-        <field name="orig_c_z_order" labelOnTop="0"/>
-        <field name="orig_class" labelOnTop="0"/>
-        <field name="orig_id" labelOnTop="0"/>
-        <field name="orig_label_rota" labelOnTop="0"/>
-        <field name="orig_label_x" labelOnTop="0"/>
-        <field name="orig_label_y" labelOnTop="0"/>
-        <field name="orig_name" labelOnTop="0"/>
-        <field name="orig_oneway" labelOnTop="0"/>
-        <field name="orig_ref" labelOnTop="0"/>
-        <field name="orig_service" labelOnTop="0"/>
-        <field name="orig_show" labelOnTop="0"/>
-        <field name="orig_tunnel" labelOnTop="0"/>
-        <field name="orig_type" labelOnTop="0"/>
-        <field name="orig_z_order" labelOnTop="0"/>
-        <field name="osm_id" labelOnTop="0"/>
-        <field name="other_tags" labelOnTop="0"/>
-        <field name="resident_a" labelOnTop="0"/>
-        <field name="resident_access" labelOnTop="0"/>
-        <field name="waterway" labelOnTop="0"/>
-        <field name="z_order" labelOnTop="0"/>
+        <field labelOnTop="0" name="aerialway"/>
+        <field labelOnTop="0" name="always_sho"/>
+        <field labelOnTop="0" name="auxiliary_storage_labeling_show"/>
+        <field labelOnTop="0" name="barrier"/>
+        <field labelOnTop="0" name="highway"/>
+        <field labelOnTop="0" name="label_rota"/>
+        <field labelOnTop="0" name="label_x"/>
+        <field labelOnTop="0" name="label_y"/>
+        <field labelOnTop="0" name="man_made"/>
+        <field labelOnTop="0" name="name"/>
+        <field labelOnTop="0" name="never_show"/>
+        <field labelOnTop="0" name="orig_access"/>
+        <field labelOnTop="0" name="orig_always_sho"/>
+        <field labelOnTop="0" name="orig_bridge"/>
+        <field labelOnTop="0" name="orig_c_z_order"/>
+        <field labelOnTop="0" name="orig_class"/>
+        <field labelOnTop="0" name="orig_id"/>
+        <field labelOnTop="0" name="orig_label_rota"/>
+        <field labelOnTop="0" name="orig_label_x"/>
+        <field labelOnTop="0" name="orig_label_y"/>
+        <field labelOnTop="0" name="orig_name"/>
+        <field labelOnTop="0" name="orig_oneway"/>
+        <field labelOnTop="0" name="orig_ref"/>
+        <field labelOnTop="0" name="orig_service"/>
+        <field labelOnTop="0" name="orig_show"/>
+        <field labelOnTop="0" name="orig_tunnel"/>
+        <field labelOnTop="0" name="orig_type"/>
+        <field labelOnTop="0" name="orig_z_order"/>
+        <field labelOnTop="0" name="osm_id"/>
+        <field labelOnTop="0" name="other_tags"/>
+        <field labelOnTop="0" name="resident_a"/>
+        <field labelOnTop="0" name="resident_access"/>
+        <field labelOnTop="0" name="waterway"/>
+        <field labelOnTop="0" name="z_order"/>
       </labelOnTop>
       <reuseLastValue>
-        <field name="aerialway" reuseLastValue="0"/>
-        <field name="always_sho" reuseLastValue="0"/>
-        <field name="auxiliary_storage_labeling_show" reuseLastValue="0"/>
-        <field name="barrier" reuseLastValue="0"/>
-        <field name="highway" reuseLastValue="0"/>
-        <field name="label_rota" reuseLastValue="0"/>
-        <field name="label_x" reuseLastValue="0"/>
-        <field name="label_y" reuseLastValue="0"/>
-        <field name="man_made" reuseLastValue="0"/>
-        <field name="name" reuseLastValue="0"/>
-        <field name="never_show" reuseLastValue="0"/>
-        <field name="osm_id" reuseLastValue="0"/>
-        <field name="other_tags" reuseLastValue="0"/>
-        <field name="resident_a" reuseLastValue="0"/>
-        <field name="waterway" reuseLastValue="0"/>
-        <field name="z_order" reuseLastValue="0"/>
+        <field reuseLastValue="0" name="aerialway"/>
+        <field reuseLastValue="0" name="always_sho"/>
+        <field reuseLastValue="0" name="auxiliary_storage_labeling_show"/>
+        <field reuseLastValue="0" name="barrier"/>
+        <field reuseLastValue="0" name="highway"/>
+        <field reuseLastValue="0" name="label_rota"/>
+        <field reuseLastValue="0" name="label_x"/>
+        <field reuseLastValue="0" name="label_y"/>
+        <field reuseLastValue="0" name="man_made"/>
+        <field reuseLastValue="0" name="name"/>
+        <field reuseLastValue="0" name="never_show"/>
+        <field reuseLastValue="0" name="osm_id"/>
+        <field reuseLastValue="0" name="other_tags"/>
+        <field reuseLastValue="0" name="resident_a"/>
+        <field reuseLastValue="0" name="waterway"/>
+        <field reuseLastValue="0" name="z_order"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets>
@@ -19037,7 +19039,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" simplifyLocal="1" autoRefreshTime="0" wkbType="Point" simplifyDrawingHints="0" type="vector" symbologyReferenceScale="-1" minScale="100000000" legendPlaceholderImage="" refreshOnNotifyEnabled="0" labelsEnabled="1" maxScale="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" refreshOnNotifyMessage="" readOnly="0" geometry="Point" autoRefreshEnabled="0" simplifyDrawingTol="1">
+    <maplayer simplifyLocal="1" simplifyDrawingHints="0" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1" legendPlaceholderImage="" symbologyReferenceScale="-1" readOnly="0" refreshOnNotifyEnabled="0" minScale="100000000" maxScale="0" type="vector" autoRefreshTime="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="1" styleCategories="AllStyleCategories" geometry="Point" autoRefreshEnabled="0" wkbType="Point">
       <extent>
         <xmin>18.3984390148267174</xmin>
         <ymin>-33.90832575607554134</ymin>
@@ -19102,7 +19104,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxy="0" minz="0" dimensions="2" maxx="0" maxz="0" miny="0" minx="0" crs=""/>
+          <spatial maxz="0" minx="0" maxx="0" minz="0" crs="" miny="0" maxy="0" dimensions="2"/>
           <temporal>
             <period>
               <start></start>
@@ -19127,58 +19129,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" startExpression="" mode="0" limitMode="0" endField="" fixedDuration="0" accumulate="0" durationUnit="min" startField="" endExpression="" enabled="0">
+      <temporal durationField="" fixedDuration="0" accumulate="0" endField="" startField="" enabled="0" startExpression="" endExpression="" durationUnit="min" mode="0" limitMode="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" zscale="1" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" binding="Centroid" type="IndividualFeatures" symbology="Line" extrusion="0" zoffset="0">
+      <elevation extrusionEnabled="0" symbology="Line" type="IndividualFeatures" zscale="1" clamping="Terrain" showMarkerSymbolInSurfacePlots="0" zoffset="0" extrusion="0" respectLayerSymbol="1" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="231,113,72,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="231,113,72,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -19209,36 +19211,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="231,113,72,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="165,81,51,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="231,113,72,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="165,81,51,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="231,113,72,255"/>
@@ -19253,44 +19255,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="231,113,72,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="165,81,51,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="231,113,72,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="diamond" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="165,81,51,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="3" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -19313,54 +19315,54 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" type="RuleRenderer" symbollevels="0" referencescale="-1" enableorderby="0">
+      <renderer-v2 enableorderby="0" type="RuleRenderer" symbollevels="0" referencescale="-1" forceraster="0">
         <rules key="{0927a9cd-bbb2-44ea-811b-fdbcb767a09a}">
-          <rule filter="regexp_match( &quot;type&quot;, '(start|finish)')" symbol="0" key="{efda7615-994b-459d-a657-ee8185286b0b}"/>
-          <rule filter="&quot;type&quot; = 'toilets'" symbol="1" key="{98bd58c0-fb3f-467c-aba3-c7ae911ad149}"/>
-          <rule filter="&quot;type&quot; = 'togbag'" symbol="2" key="{0d82fc83-a3cd-4068-9d3a-0fb004f8cfa5}"/>
-          <rule filter=" &quot;type&quot; = 'closure'" symbol="3" key="{67af661e-65f1-44a7-9993-d5a668077b33}"/>
-          <rule filter="&quot;type&quot; = 'myciti'" symbol="4" key="{b99204cf-0adb-4656-90a9-4ae7d773a6f9}"/>
-          <rule filter="&quot;type&quot; = 'parking'" symbol="5" key="{96cc1758-d85e-4ed4-99e8-6e2730d07f11}"/>
+          <rule symbol="0" key="{efda7615-994b-459d-a657-ee8185286b0b}" filter="regexp_match( &quot;type&quot;, '(start|finish)')"/>
+          <rule symbol="1" key="{98bd58c0-fb3f-467c-aba3-c7ae911ad149}" filter="&quot;type&quot; = 'toilets'"/>
+          <rule symbol="2" key="{0d82fc83-a3cd-4068-9d3a-0fb004f8cfa5}" filter="&quot;type&quot; = 'togbag'"/>
+          <rule symbol="3" key="{67af661e-65f1-44a7-9993-d5a668077b33}" filter=" &quot;type&quot; = 'closure'"/>
+          <rule symbol="4" key="{b99204cf-0adb-4656-90a9-4ae7d773a6f9}" filter="&quot;type&quot; = 'myciti'"/>
+          <rule symbol="5" key="{96cc1758-d85e-4ed4-99e8-6e2730d07f11}" filter="&quot;type&quot; = 'parking'"/>
         </rules>
         <symbols>
-          <symbol is_animated="0" type="marker" name="0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="0,0,0,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="round" type="QString" name="joinstyle"/>
-                <Option value="star" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.5" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="7" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="0,0,0,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="round" name="joinstyle"/>
+                <Option type="QString" value="star" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.5" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="7" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -19383,47 +19385,47 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="size">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="if( @map_scale &lt; 7000, '14', '7' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="QString" value="if( @map_scale &lt; 7000, '14', '7' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" type="marker" name="1" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SvgMarker" enabled="1">
+            <layer locked="0" class="SvgMarker" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="0,32,80,255" type="QString" name="color"/>
-                <Option value="0" type="QString" name="fixedAspectRatio"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="amenity/amenity_toilets.svg" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="0" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="0,32,80,255" name="color"/>
+                <Option type="QString" value="0" name="fixedAspectRatio"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="amenity/amenity_toilets.svg" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                <Option type="QString" value="0" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
                 <Option name="parameters"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="7" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="7" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="color" v="0,32,80,255"/>
@@ -19445,47 +19447,47 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="size">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="if( @map_scale &lt; 7000, '10', '5' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="QString" value="if( @map_scale &lt; 7000, '10', '5' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" type="marker" name="2" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="2">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SvgMarker" enabled="1">
+            <layer locked="0" class="SvgMarker" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="0,0,0,255" type="QString" name="color"/>
-                <Option value="0" type="QString" name="fixedAspectRatio"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="../images/gym-bag.svg" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="0,0,0,255" name="color"/>
+                <Option type="QString" value="0" name="fixedAspectRatio"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="../images/gym-bag.svg" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
                 <Option name="parameters"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="6" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="6" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="color" v="0,0,0,255"/>
@@ -19507,57 +19509,57 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="fillColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="CASE&#xa;WHEN &quot;distance&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;distance&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;distance&quot; = '5KM'  THEN '#456419'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="CASE&#xa;WHEN &quot;distance&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;distance&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;distance&quot; = '5KM'  THEN '#456419'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="outlineColor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="size">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="if( @map_scale &lt; 7000, '10', '5' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="QString" value="if( @map_scale &lt; 7000, '10', '5' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" type="marker" name="3" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="3">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SvgMarker" enabled="1">
+            <layer locked="0" class="SvgMarker" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="125,139,143,255" type="QString" name="color"/>
-                <Option value="0" type="QString" name="fixedAspectRatio"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="../images/road_closure.svg" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="0" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="125,139,143,255" name="color"/>
+                <Option type="QString" value="0" name="fixedAspectRatio"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="../images/road_closure.svg" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                <Option type="QString" value="0" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
                 <Option name="parameters"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="6" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="6" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="color" v="125,139,143,255"/>
@@ -19579,47 +19581,47 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="size">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="if( @map_scale &lt; 7000, '10', '6' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="QString" value="if( @map_scale &lt; 7000, '10', '6' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" type="marker" name="4" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="4">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SvgMarker" enabled="1">
+            <layer locked="0" class="SvgMarker" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="0,12,254,255" type="QString" name="color"/>
-                <Option value="0" type="QString" name="fixedAspectRatio"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="transport/transport_bus_stop.svg" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="255,255,255,255" type="QString" name="outline_color"/>
-                <Option value="0" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="0,12,254,255" name="color"/>
+                <Option type="QString" value="0" name="fixedAspectRatio"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="transport/transport_bus_stop.svg" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="255,255,255,255" name="outline_color"/>
+                <Option type="QString" value="0" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
                 <Option name="parameters"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="5" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="5" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="color" v="0,12,254,255"/>
@@ -19642,18 +19644,18 @@ def my_form_open(dialog, layer, feature):
               <effect type="effectStack" enabled="0">
                 <effect type="dropShadow">
                   <Option type="Map">
-                    <Option value="13" type="QString" name="blend_mode"/>
-                    <Option value="2.645" type="QString" name="blur_level"/>
-                    <Option value="MM" type="QString" name="blur_unit"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="blur_unit_scale"/>
-                    <Option value="0,0,0,255" type="QString" name="color"/>
-                    <Option value="2" type="QString" name="draw_mode"/>
-                    <Option value="0" type="QString" name="enabled"/>
-                    <Option value="135" type="QString" name="offset_angle"/>
-                    <Option value="2" type="QString" name="offset_distance"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_unit_scale"/>
-                    <Option value="1" type="QString" name="opacity"/>
+                    <Option type="QString" value="13" name="blend_mode"/>
+                    <Option type="QString" value="2.645" name="blur_level"/>
+                    <Option type="QString" value="MM" name="blur_unit"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
+                    <Option type="QString" value="0,0,0,255" name="color"/>
+                    <Option type="QString" value="2" name="draw_mode"/>
+                    <Option type="QString" value="0" name="enabled"/>
+                    <Option type="QString" value="135" name="offset_angle"/>
+                    <Option type="QString" value="2" name="offset_distance"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_unit_scale"/>
+                    <Option type="QString" value="1" name="opacity"/>
                   </Option>
                   <prop k="blend_mode" v="13"/>
                   <prop k="blur_level" v="2.645"/>
@@ -19670,24 +19672,24 @@ def my_form_open(dialog, layer, feature):
                 </effect>
                 <effect type="outerGlow">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="blend_mode"/>
-                    <Option value="0.7935" type="QString" name="blur_level"/>
-                    <Option value="MM" type="QString" name="blur_unit"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="blur_unit_scale"/>
-                    <Option value="0,0,255,255" type="QString" name="color1"/>
-                    <Option value="0,255,0,255" type="QString" name="color2"/>
-                    <Option value="0" type="QString" name="color_type"/>
-                    <Option value="ccw" type="QString" name="direction"/>
-                    <Option value="0" type="QString" name="discrete"/>
-                    <Option value="2" type="QString" name="draw_mode"/>
-                    <Option value="1" type="QString" name="enabled"/>
-                    <Option value="0.5" type="QString" name="opacity"/>
-                    <Option value="gradient" type="QString" name="rampType"/>
-                    <Option value="255,255,255,255" type="QString" name="single_color"/>
-                    <Option value="rgb" type="QString" name="spec"/>
-                    <Option value="2" type="QString" name="spread"/>
-                    <Option value="MM" type="QString" name="spread_unit"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="spread_unit_scale"/>
+                    <Option type="QString" value="0" name="blend_mode"/>
+                    <Option type="QString" value="0.7935" name="blur_level"/>
+                    <Option type="QString" value="MM" name="blur_unit"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
+                    <Option type="QString" value="0,0,255,255" name="color1"/>
+                    <Option type="QString" value="0,255,0,255" name="color2"/>
+                    <Option type="QString" value="0" name="color_type"/>
+                    <Option type="QString" value="ccw" name="direction"/>
+                    <Option type="QString" value="0" name="discrete"/>
+                    <Option type="QString" value="2" name="draw_mode"/>
+                    <Option type="QString" value="1" name="enabled"/>
+                    <Option type="QString" value="0.5" name="opacity"/>
+                    <Option type="QString" value="gradient" name="rampType"/>
+                    <Option type="QString" value="255,255,255,255" name="single_color"/>
+                    <Option type="QString" value="rgb" name="spec"/>
+                    <Option type="QString" value="2" name="spread"/>
+                    <Option type="QString" value="MM" name="spread_unit"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="spread_unit_scale"/>
                   </Option>
                   <prop k="blend_mode" v="0"/>
                   <prop k="blur_level" v="0.7935"/>
@@ -19710,10 +19712,10 @@ def my_form_open(dialog, layer, feature):
                 </effect>
                 <effect type="drawSource">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="blend_mode"/>
-                    <Option value="2" type="QString" name="draw_mode"/>
-                    <Option value="1" type="QString" name="enabled"/>
-                    <Option value="1" type="QString" name="opacity"/>
+                    <Option type="QString" value="0" name="blend_mode"/>
+                    <Option type="QString" value="2" name="draw_mode"/>
+                    <Option type="QString" value="1" name="enabled"/>
+                    <Option type="QString" value="1" name="opacity"/>
                   </Option>
                   <prop k="blend_mode" v="0"/>
                   <prop k="draw_mode" v="2"/>
@@ -19722,18 +19724,18 @@ def my_form_open(dialog, layer, feature):
                 </effect>
                 <effect type="innerShadow">
                   <Option type="Map">
-                    <Option value="13" type="QString" name="blend_mode"/>
-                    <Option value="2.645" type="QString" name="blur_level"/>
-                    <Option value="MM" type="QString" name="blur_unit"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="blur_unit_scale"/>
-                    <Option value="0,0,0,255" type="QString" name="color"/>
-                    <Option value="2" type="QString" name="draw_mode"/>
-                    <Option value="0" type="QString" name="enabled"/>
-                    <Option value="135" type="QString" name="offset_angle"/>
-                    <Option value="2" type="QString" name="offset_distance"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_unit_scale"/>
-                    <Option value="1" type="QString" name="opacity"/>
+                    <Option type="QString" value="13" name="blend_mode"/>
+                    <Option type="QString" value="2.645" name="blur_level"/>
+                    <Option type="QString" value="MM" name="blur_unit"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
+                    <Option type="QString" value="0,0,0,255" name="color"/>
+                    <Option type="QString" value="2" name="draw_mode"/>
+                    <Option type="QString" value="0" name="enabled"/>
+                    <Option type="QString" value="135" name="offset_angle"/>
+                    <Option type="QString" value="2" name="offset_distance"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_unit_scale"/>
+                    <Option type="QString" value="1" name="opacity"/>
                   </Option>
                   <prop k="blend_mode" v="13"/>
                   <prop k="blur_level" v="2.645"/>
@@ -19750,24 +19752,24 @@ def my_form_open(dialog, layer, feature):
                 </effect>
                 <effect type="innerGlow">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="blend_mode"/>
-                    <Option value="0.7935" type="QString" name="blur_level"/>
-                    <Option value="MM" type="QString" name="blur_unit"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="blur_unit_scale"/>
-                    <Option value="0,0,255,255" type="QString" name="color1"/>
-                    <Option value="0,255,0,255" type="QString" name="color2"/>
-                    <Option value="0" type="QString" name="color_type"/>
-                    <Option value="ccw" type="QString" name="direction"/>
-                    <Option value="0" type="QString" name="discrete"/>
-                    <Option value="2" type="QString" name="draw_mode"/>
-                    <Option value="0" type="QString" name="enabled"/>
-                    <Option value="0.5" type="QString" name="opacity"/>
-                    <Option value="gradient" type="QString" name="rampType"/>
-                    <Option value="255,255,255,255" type="QString" name="single_color"/>
-                    <Option value="rgb" type="QString" name="spec"/>
-                    <Option value="2" type="QString" name="spread"/>
-                    <Option value="MM" type="QString" name="spread_unit"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="spread_unit_scale"/>
+                    <Option type="QString" value="0" name="blend_mode"/>
+                    <Option type="QString" value="0.7935" name="blur_level"/>
+                    <Option type="QString" value="MM" name="blur_unit"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
+                    <Option type="QString" value="0,0,255,255" name="color1"/>
+                    <Option type="QString" value="0,255,0,255" name="color2"/>
+                    <Option type="QString" value="0" name="color_type"/>
+                    <Option type="QString" value="ccw" name="direction"/>
+                    <Option type="QString" value="0" name="discrete"/>
+                    <Option type="QString" value="2" name="draw_mode"/>
+                    <Option type="QString" value="0" name="enabled"/>
+                    <Option type="QString" value="0.5" name="opacity"/>
+                    <Option type="QString" value="gradient" name="rampType"/>
+                    <Option type="QString" value="255,255,255,255" name="single_color"/>
+                    <Option type="QString" value="rgb" name="spec"/>
+                    <Option type="QString" value="2" name="spread"/>
+                    <Option type="QString" value="MM" name="spread_unit"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="spread_unit_scale"/>
                   </Option>
                   <prop k="blend_mode" v="0"/>
                   <prop k="blur_level" v="0.7935"/>
@@ -19791,47 +19793,47 @@ def my_form_open(dialog, layer, feature):
               </effect>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="size">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" type="marker" name="5" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="5">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SvgMarker" enabled="1">
+            <layer locked="0" class="SvgMarker" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="43,153,41,255" type="QString" name="color"/>
-                <Option value="0" type="QString" name="fixedAspectRatio"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="transport/amenity=parking.svg" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="0" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="43,153,41,255" name="color"/>
+                <Option type="QString" value="0" name="fixedAspectRatio"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="transport/amenity=parking.svg" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                <Option type="QString" value="0" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
                 <Option name="parameters"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="6" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="6" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="color" v="43,153,41,255"/>
@@ -19853,15 +19855,15 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="size">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="if( @map_scale &lt; 7000, '10', '5' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="QString" value="if( @map_scale &lt; 7000, '10', '5' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -19870,32 +19872,32 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="63" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="0.90000000000000002" fieldName="name" useSubstitutions="0" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="10" namedStyle="Semibold" forcedItalic="0" isExpression="0" fontSizeUnit="Point" allowHtml="0" legendString="Aa">
+          <text-style textOpacity="0.90000000000000002" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="Semibold" fontUnderline="0" fieldName="name" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" useSubstitutions="0" fontWeight="63" fontStrikeout="0" fontItalic="0" fontSize="10" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" isExpression="0" legendString="Aa" textOrientation="horizontal">
             <families/>
-            <text-buffer bufferNoFill="0" bufferBlendMode="0" bufferSize="2" bufferJoinStyle="128" bufferDraw="1" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="0.80000000000000004" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="0"/>
-            <background shapeRadiiY="2" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="1" shapeFillColor="255,255,255,255" shapeDraw="0" shapeBorderWidth="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="1" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="0.69999999999999996" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="2" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-              <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <text-buffer bufferNoFill="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="2" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="0.80000000000000004"/>
+            <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskType="0"/>
+            <background shapeRadiiY="2" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeSizeX="1" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="0.69999999999999996" shapeSizeY="1" shapeRadiiX="2">
+              <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                    <Option value="255,255,255,255" type="QString" name="color"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                    <Option value="no" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="solid" type="QString" name="style"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                    <Option type="QString" value="255,255,255,255" name="color"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                    <Option type="QString" value="no" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="solid" name="style"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -19910,99 +19912,99 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+            <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option type="Map" name="properties">
                   <Option type="Map" name="LabelDistance">
-                    <Option value="true" type="bool" name="active"/>
-                    <Option value="if( @map_scale &lt; 7000, '5', '3' )" type="QString" name="expression"/>
-                    <Option value="3" type="int" name="type"/>
+                    <Option type="bool" value="true" name="active"/>
+                    <Option type="QString" value="if( @map_scale &lt; 7000, '5', '3' )" name="expression"/>
+                    <Option type="int" value="3" name="type"/>
                   </Option>
                   <Option type="Map" name="OffsetQuad">
-                    <Option value="true" type="bool" name="active"/>
-                    <Option value="2" type="QString" name="expression"/>
-                    <Option value="3" type="int" name="type"/>
+                    <Option type="bool" value="true" name="active"/>
+                    <Option type="QString" value="2" name="expression"/>
+                    <Option type="int" value="3" name="type"/>
                   </Option>
                   <Option type="Map" name="Size">
-                    <Option value="true" type="bool" name="active"/>
-                    <Option value="if( @map_scale &lt; 7000, '14', '10' )" type="QString" name="expression"/>
-                    <Option value="3" type="int" name="type"/>
+                    <Option type="bool" value="true" name="active"/>
+                    <Option type="QString" value="if( @map_scale &lt; 7000, '14', '10' )" name="expression"/>
+                    <Option type="int" value="3" name="type"/>
                   </Option>
                 </Option>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format useMaxLineLengthForAutoWrap="1" leftDirectionSymbol="&lt;" wrapChar="" multilineAlign="3" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" decimals="3" rightDirectionSymbol=">" formatNumbers="0"/>
-          <placement overlapHandling="AllowOverlapIfRequired" lineAnchorType="0" centroidInside="0" overrunDistance="0" centroidWhole="0" geometryGeneratorEnabled="0" rotationAngle="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" geometryGeneratorType="PointGeometry" quadOffset="2" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="0" xOffset="2" allowDegraded="1" lineAnchorTextPoint="CenterOfText" layerType="UnknownGeometry" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" maxCurvedCharAngleOut="-25" repeatDistance="0" offsetUnits="MM" repeatDistanceUnits="MM" dist="3" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" distUnits="MM" lineAnchorClipping="0" placementFlags="10" priority="10" overrunDistanceUnit="MM" maxCurvedCharAngleIn="25" geometryGenerator="" lineAnchorPercent="0.5" yOffset="3" rotationUnit="AngleDegrees"/>
-          <rendering fontMaxPixelSize="10000" drawLabels="1" mergeLines="0" zIndex="10" upsidedownLabels="0" obstacleFactor="1.8" scaleVisibility="0" limitNumLabels="0" obstacleType="0" fontLimitPixelSize="0" maxNumLabels="2000" minFeatureSize="0" fontMinPixelSize="3" labelPerPart="0" obstacle="1" scaleMax="0" scaleMin="0" unplacedVisibility="0"/>
+          <text-format wrapChar="" rightDirectionSymbol=">" plussign="0" leftDirectionSymbol="&lt;" formatNumbers="0" decimals="3" multilineAlign="3" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
+          <placement offsetUnits="MM" xOffset="2" maxCurvedCharAngleOut="-25" layerType="UnknownGeometry" allowDegraded="1" yOffset="3" overlapHandling="AllowOverlapIfRequired" geometryGeneratorType="PointGeometry" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" repeatDistanceUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25" quadOffset="2" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidWhole="0" overrunDistance="0" overrunDistanceUnit="MM" centroidInside="0" placement="0" geometryGenerator="" priority="10" distUnits="MM" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" dist="3" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorTextPoint="CenterOfText" polygonPlacementFlags="2" rotationUnit="AngleDegrees" offsetType="0" placementFlags="10" repeatDistance="0"/>
+          <rendering limitNumLabels="0" obstacleType="0" obstacle="1" scaleMax="0" maxNumLabels="2000" labelPerPart="0" scaleMin="0" upsidedownLabels="0" zIndex="10" unplacedVisibility="0" fontLimitPixelSize="0" minFeatureSize="0" fontMaxPixelSize="10000" scaleVisibility="0" fontMinPixelSize="3" drawLabels="1" mergeLines="0" obstacleFactor="1.8"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="LabelDistance">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="if( @map_scale &lt; 7000, '5', '3' )" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="if( @map_scale &lt; 7000, '5', '3' )" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
                 <Option type="Map" name="OffsetQuad">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="2" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="2" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
                 <Option type="Map" name="Size">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="if( @map_scale &lt; 7000, '14', '10' )" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="if( @map_scale &lt; 7000, '14', '10' )" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-              <Option value="0" type="int" name="blendMode"/>
+              <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+              <Option type="int" value="0" name="blendMode"/>
               <Option type="Map" name="ddProperties">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
-              <Option value="false" type="bool" name="drawToAllParts"/>
-              <Option value="0" type="QString" name="enabled"/>
-              <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-              <Option value="&lt;symbol is_animated=&quot;0&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-              <Option value="0" type="double" name="minLength"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-              <Option value="MM" type="QString" name="minLengthUnit"/>
-              <Option value="0" type="double" name="offsetFromAnchor"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-              <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-              <Option value="0" type="double" name="offsetFromLabel"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-              <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+              <Option type="bool" value="false" name="drawToAllParts"/>
+              <Option type="QString" value="0" name="enabled"/>
+              <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
+              <Option type="QString" value="&lt;symbol alpha=&quot;1&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
+              <Option type="double" value="0" name="minLength"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
+              <Option type="QString" value="MM" name="minLengthUnit"/>
+              <Option type="double" value="0" name="offsetFromAnchor"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
+              <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
+              <Option type="double" value="0" name="offsetFromLabel"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
+              <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option value="id" type="QString" name="dualview/previewExpressions"/>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="QString" value="copy" name="QFieldSync/action"/>
+          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="id" name="dualview/previewExpressions"/>
+          <Option type="QString" value="0" name="embeddedWidgets/count"/>
           <Option type="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -20010,48 +20012,48 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory penAlpha="255" width="15" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" minimumSize="0" enabled="0" maxScaleDenominator="1e+08" diagramOrientation="Up" opacity="1" scaleBasedVisibility="0" spacingUnit="MM" minScaleDenominator="0" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" lineSizeType="MM" penWidth="0" backgroundAlpha="255" scaleDependency="Area" spacing="0" direction="1" barWidth="5" sizeType="MM" height="15" penColor="#000000" showAxis="0">
-          <fontProperties bold="0" style="0" italic="1" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" strikethrough="0"/>
-          <attribute label="" colorOpacity="1" field="" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory height="15" scaleDependency="Area" width="15" lineSizeScale="3x:0,0,0,0,0,0" spacingUnit="MM" lineSizeType="MM" penColor="#000000" spacing="0" labelPlacementMethod="XHeight" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" backgroundAlpha="255" maxScaleDenominator="1e+08" barWidth="5" penWidth="0" minimumSize="0" penAlpha="255" minScaleDenominator="0" sizeType="MM" backgroundColor="#ffffff" enabled="0" opacity="1" direction="1" scaleBasedVisibility="0" showAxis="0" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270">
+          <fontProperties style="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" strikethrough="0" italic="1" underline="0" bold="0"/>
+          <attribute color="#000000" field="" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="35,35,35,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0.26" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -20082,9 +20084,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -20092,20 +20094,20 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" showAll="1" placement="0" zIndex="0" dist="0" priority="0" obstacle="0">
+      <DiagramLayerSettings priority="0" linePlacementFlags="18" obstacle="0" dist="0" zIndex="0" placement="0" showAll="1">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field configurationFlags="None" name="id">
@@ -20138,40 +20140,40 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
-        <alias index="1" name="" field="type"/>
-        <alias index="2" name="" field="name"/>
-        <alias index="3" name="" field="distance"/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="type" name=""/>
+        <alias index="2" field="name" name=""/>
+        <alias index="3" field="distance" name=""/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="type"/>
-        <default applyOnUpdate="0" expression="" field="name"/>
-        <default applyOnUpdate="0" expression="" field="distance"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="type" expression=""/>
+        <default applyOnUpdate="0" field="name" expression=""/>
+        <default applyOnUpdate="0" field="distance" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="id" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="type" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="name" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="distance" constraints="0"/>
+        <constraint exp_strength="0" field="id" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="type" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="name" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="distance" notnull_strength="0" constraints="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" desc="" field="id"/>
-        <constraint exp="" desc="" field="type"/>
-        <constraint exp="" desc="" field="name"/>
-        <constraint exp="" desc="" field="distance"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="type" desc=""/>
+        <constraint exp="" field="name" desc=""/>
+        <constraint exp="" field="distance" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="&quot;type&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="&quot;type&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column width="-1" type="field" name="id" hidden="0"/>
-          <column width="-1" type="field" name="type" hidden="0"/>
+          <column width="-1" type="field" hidden="0" name="id"/>
+          <column width="-1" type="field" hidden="0" name="type"/>
           <column width="-1" type="actions" hidden="1"/>
-          <column width="-1" type="field" name="name" hidden="0"/>
-          <column width="-1" type="field" name="distance" hidden="0"/>
+          <column width="-1" type="field" hidden="0" name="name"/>
+          <column width="-1" type="field" hidden="0" name="distance"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -20203,16 +20205,16 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="distance" editable="1"/>
-        <field name="id" editable="1"/>
-        <field name="name" editable="1"/>
-        <field name="type" editable="1"/>
+        <field editable="1" name="distance"/>
+        <field editable="1" name="id"/>
+        <field editable="1" name="name"/>
+        <field editable="1" name="type"/>
       </editable>
       <labelOnTop>
-        <field name="distance" labelOnTop="0"/>
-        <field name="id" labelOnTop="0"/>
-        <field name="name" labelOnTop="0"/>
-        <field name="type" labelOnTop="0"/>
+        <field labelOnTop="0" name="distance"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="name"/>
+        <field labelOnTop="0" name="type"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -20220,7 +20222,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" simplifyLocal="1" autoRefreshTime="0" wkbType="MultiPolygon" simplifyDrawingHints="1" type="vector" symbologyReferenceScale="-1" minScale="100000000" legendPlaceholderImage="" refreshOnNotifyEnabled="0" labelsEnabled="0" maxScale="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" refreshOnNotifyMessage="" readOnly="0" geometry="Polygon" autoRefreshEnabled="0" simplifyDrawingTol="1">
+    <maplayer simplifyLocal="1" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1" legendPlaceholderImage="" symbologyReferenceScale="-1" readOnly="0" refreshOnNotifyEnabled="0" minScale="100000000" maxScale="0" type="vector" autoRefreshTime="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="0" styleCategories="AllStyleCategories" geometry="Polygon" autoRefreshEnabled="0" wkbType="MultiPolygon">
       <extent>
         <xmin>18.37312291788339991</xmin>
         <ymin>-33.931815589166888</ymin>
@@ -20293,58 +20295,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" startExpression="" mode="0" limitMode="0" endField="" fixedDuration="0" accumulate="0" durationUnit="min" startField="" endExpression="" enabled="0">
+      <temporal durationField="" fixedDuration="0" accumulate="0" endField="" startField="" enabled="0" startExpression="" endExpression="" durationUnit="min" mode="0" limitMode="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" zscale="1" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" binding="Centroid" type="IndividualFeatures" symbology="Line" extrusion="0" zoffset="0">
+      <elevation extrusionEnabled="0" symbology="Line" type="IndividualFeatures" zscale="1" clamping="Terrain" showMarkerSymbolInSurfacePlots="0" zoffset="0" extrusion="0" respectLayerSymbol="1" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="152,125,183,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="152,125,183,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -20375,36 +20377,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="152,125,183,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="109,89,131,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="152,125,183,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="109,89,131,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="152,125,183,255"/>
@@ -20419,44 +20421,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="152,125,183,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="109,89,131,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="152,125,183,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="diamond" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="109,89,131,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="3" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -20479,42 +20481,42 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" type="singleSymbol" symbollevels="0" referencescale="-1" enableorderby="0">
+      <renderer-v2 enableorderby="0" type="singleSymbol" symbollevels="0" referencescale="-1" forceraster="0">
         <symbols>
-          <symbol is_animated="0" type="fill" name="0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="LinePatternFill" enabled="1">
+            <layer locked="0" class="LinePatternFill" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="135" type="QString" name="angle"/>
-                <Option value="during_render" type="QString" name="clip_mode"/>
-                <Option value="211,134,33,255" type="QString" name="color"/>
-                <Option value="feature" type="QString" name="coordinate_reference"/>
-                <Option value="2" type="QString" name="distance"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="distance_map_unit_scale"/>
-                <Option value="MM" type="QString" name="distance_unit"/>
-                <Option value="0.26" type="QString" name="line_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="line_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option type="QString" value="135" name="angle"/>
+                <Option type="QString" value="during_render" name="clip_mode"/>
+                <Option type="QString" value="211,134,33,255" name="color"/>
+                <Option type="QString" value="feature" name="coordinate_reference"/>
+                <Option type="QString" value="2" name="distance"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="distance_map_unit_scale"/>
+                <Option type="QString" value="MM" name="distance_unit"/>
+                <Option type="QString" value="0.26" name="line_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="line_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
               </Option>
               <prop k="angle" v="135"/>
               <prop k="clip_mode" v="during_render"/>
@@ -20533,48 +20535,48 @@ def my_form_open(dialog, layer, feature):
               <prop k="outline_width_unit" v="MM"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" type="line" name="@0@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+              <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@0@0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+                <layer locked="0" class="SimpleLine" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="align_dash_pattern"/>
-                    <Option value="square" type="QString" name="capstyle"/>
-                    <Option value="5;2" type="QString" name="customdash"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="customdash_unit"/>
-                    <Option value="0" type="QString" name="dash_pattern_offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                    <Option value="0" type="QString" name="draw_inside_polygon"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="211,134,33,255" type="QString" name="line_color"/>
-                    <Option value="solid" type="QString" name="line_style"/>
-                    <Option value="0.3" type="QString" name="line_width"/>
-                    <Option value="MM" type="QString" name="line_width_unit"/>
-                    <Option value="0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0" type="QString" name="ring_filter"/>
-                    <Option value="0" type="QString" name="trim_distance_end"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                    <Option value="0" type="QString" name="trim_distance_start"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                    <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                    <Option value="0" type="QString" name="use_custom_dash"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                    <Option type="QString" value="0" name="align_dash_pattern"/>
+                    <Option type="QString" value="square" name="capstyle"/>
+                    <Option type="QString" value="5;2" name="customdash"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="customdash_unit"/>
+                    <Option type="QString" value="0" name="dash_pattern_offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                    <Option type="QString" value="0" name="draw_inside_polygon"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="211,134,33,255" name="line_color"/>
+                    <Option type="QString" value="solid" name="line_style"/>
+                    <Option type="QString" value="0.3" name="line_width"/>
+                    <Option type="QString" value="MM" name="line_width_unit"/>
+                    <Option type="QString" value="0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="0" name="ring_filter"/>
+                    <Option type="QString" value="0" name="trim_distance_end"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                    <Option type="QString" value="0" name="trim_distance_start"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                    <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                    <Option type="QString" value="0" name="use_custom_dash"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                   </Option>
                   <prop k="align_dash_pattern" v="0"/>
                   <prop k="capstyle" v="square"/>
@@ -20605,27 +20607,27 @@ def my_form_open(dialog, layer, feature):
                   <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="211,134,33,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.46" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="no" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="211,134,33,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.46" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="no" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="211,134,33,255"/>
@@ -20640,9 +20642,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="no"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -20653,11 +20655,11 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option value="id" type="QString" name="dualview/previewExpressions"/>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="QString" value="copy" name="QFieldSync/action"/>
+          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="id" name="dualview/previewExpressions"/>
+          <Option type="QString" value="0" name="embeddedWidgets/count"/>
           <Option type="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -20665,48 +20667,48 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory penAlpha="255" width="15" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" minimumSize="0" enabled="0" maxScaleDenominator="1e+08" diagramOrientation="Up" opacity="1" scaleBasedVisibility="0" spacingUnit="MM" minScaleDenominator="0" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" lineSizeType="MM" penWidth="0" backgroundAlpha="255" scaleDependency="Area" spacing="0" direction="1" barWidth="5" sizeType="MM" height="15" penColor="#000000" showAxis="0">
-          <fontProperties bold="0" style="0" italic="1" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" strikethrough="0"/>
-          <attribute label="" colorOpacity="1" field="" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory height="15" scaleDependency="Area" width="15" lineSizeScale="3x:0,0,0,0,0,0" spacingUnit="MM" lineSizeType="MM" penColor="#000000" spacing="0" labelPlacementMethod="XHeight" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" backgroundAlpha="255" maxScaleDenominator="1e+08" barWidth="5" penWidth="0" minimumSize="0" penAlpha="255" minScaleDenominator="0" sizeType="MM" backgroundColor="#ffffff" enabled="0" opacity="1" direction="1" scaleBasedVisibility="0" showAxis="0" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270">
+          <fontProperties style="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" strikethrough="0" italic="1" underline="0" bold="0"/>
+          <attribute color="#000000" field="" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="35,35,35,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0.26" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -20737,9 +20739,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -20747,20 +20749,20 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" showAll="1" placement="1" zIndex="0" dist="0" priority="0" obstacle="0">
+      <DiagramLayerSettings priority="0" linePlacementFlags="18" obstacle="0" dist="0" zIndex="0" placement="1" showAll="1">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field configurationFlags="None" name="FID">
@@ -20772,25 +20774,25 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="FID"/>
+        <alias index="0" field="FID" name=""/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="FID"/>
+        <default applyOnUpdate="0" field="FID" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="FID" constraints="0"/>
+        <constraint exp_strength="0" field="FID" notnull_strength="0" constraints="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" desc="" field="FID"/>
+        <constraint exp="" field="FID" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column width="-1" type="field" name="id" hidden="0"/>
-          <column width="431" type="field" name="type" hidden="0"/>
+          <column width="-1" type="field" hidden="0" name="id"/>
+          <column width="431" type="field" hidden="0" name="type"/>
           <column width="-1" type="actions" hidden="1"/>
         </columns>
       </attributetableconfig>
@@ -20823,12 +20825,12 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="id" editable="1"/>
-        <field name="type" editable="1"/>
+        <field editable="1" name="id"/>
+        <field editable="1" name="type"/>
       </editable>
       <labelOnTop>
-        <field name="id" labelOnTop="0"/>
-        <field name="type" labelOnTop="0"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="type"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -20836,7 +20838,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" simplifyLocal="1" autoRefreshTime="0" wkbType="MultiLineString" simplifyDrawingHints="1" type="vector" symbologyReferenceScale="-1" minScale="100000000" legendPlaceholderImage="" refreshOnNotifyEnabled="0" labelsEnabled="1" maxScale="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" refreshOnNotifyMessage="" readOnly="0" geometry="Line" autoRefreshEnabled="0" simplifyDrawingTol="1">
+    <maplayer simplifyLocal="1" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1" legendPlaceholderImage="" symbologyReferenceScale="-1" readOnly="0" refreshOnNotifyEnabled="0" minScale="100000000" maxScale="0" type="vector" autoRefreshTime="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="1" styleCategories="AllStyleCategories" geometry="Line" autoRefreshEnabled="0" wkbType="MultiLineString">
       <extent>
         <xmin>18.3752895999999879</xmin>
         <ymin>-33.94589500000000726</ymin>
@@ -20901,7 +20903,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxy="0" minz="0" dimensions="2" maxx="0" maxz="0" miny="0" minx="0" crs=""/>
+          <spatial maxz="0" minx="0" maxx="0" minz="0" crs="" miny="0" maxy="0" dimensions="2"/>
           <temporal>
             <period>
               <start></start>
@@ -20926,58 +20928,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" startExpression="" mode="0" limitMode="0" endField="" fixedDuration="0" accumulate="0" durationUnit="min" startField="" endExpression="" enabled="0">
+      <temporal durationField="" fixedDuration="0" accumulate="0" endField="" startField="" enabled="0" startExpression="" endExpression="" durationUnit="min" mode="0" limitMode="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" zscale="1" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" binding="Centroid" type="IndividualFeatures" symbology="Line" extrusion="0" zoffset="0">
+      <elevation extrusionEnabled="0" symbology="Line" type="IndividualFeatures" zscale="1" clamping="Terrain" showMarkerSymbolInSurfacePlots="0" zoffset="0" extrusion="0" respectLayerSymbol="1" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="190,207,80,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="190,207,80,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -21008,36 +21010,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="190,207,80,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="136,148,57,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="190,207,80,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="136,148,57,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="190,207,80,255"/>
@@ -21052,44 +21054,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="190,207,80,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="136,148,57,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="190,207,80,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="diamond" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="136,148,57,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="3" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -21112,61 +21114,61 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" type="RuleRenderer" symbollevels="0" referencescale="-1" enableorderby="0">
+      <renderer-v2 enableorderby="0" type="RuleRenderer" symbollevels="0" referencescale="-1" forceraster="0">
         <rules key="{57366f52-c504-4c9a-800f-dcbf1d415bf6}">
-          <rule filter="&quot;status&quot; = 'open'" symbol="0" label="Road Open" key="{1a55e945-61ef-4ec7-9d47-aa181d9fba9f}"/>
-          <rule filter="&quot;status&quot; = 'no-parking'" symbol="1" label="No Parking" key="{bb8770a2-ebd2-4359-9d1d-9ebbb7fadbfa}"/>
-          <rule filter="&quot;status&quot; = 'lane-closed'" symbol="2" label="Lane Closed" key="{141a0163-d939-4e3f-adf2-645a4b477d1a}"/>
-          <rule filter="&quot;status&quot; = 'one-way'" symbol="3" label="One-Way" key="{fff6dd36-b1a4-45e3-bfba-e41cc7bef314}"/>
-          <rule filter="&quot;status&quot; = 'closure'" symbol="4" label="Road Closures" key="{c145ac1f-246c-492e-a3fe-5817271a80c4}"/>
+          <rule symbol="0" label="Road Open" key="{1a55e945-61ef-4ec7-9d47-aa181d9fba9f}" filter="&quot;status&quot; = 'open'"/>
+          <rule symbol="1" label="No Parking" key="{bb8770a2-ebd2-4359-9d1d-9ebbb7fadbfa}" filter="&quot;status&quot; = 'no-parking'"/>
+          <rule symbol="2" label="Lane Closed" key="{141a0163-d939-4e3f-adf2-645a4b477d1a}" filter="&quot;status&quot; = 'lane-closed'"/>
+          <rule symbol="3" label="One-Way" key="{fff6dd36-b1a4-45e3-bfba-e41cc7bef314}" filter="&quot;status&quot; = 'one-way'"/>
+          <rule symbol="4" label="Road Closures" key="{c145ac1f-246c-492e-a3fe-5817271a80c4}" filter="&quot;status&quot; = 'closure'"/>
         </rules>
         <symbols>
-          <symbol is_animated="0" type="line" name="0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,255,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.75" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,255,0,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.75" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -21197,50 +21199,50 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="outlineStyle">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" type="line" name="1" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="2" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="Interval" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="2" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="Interval" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -21260,40 +21262,40 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" type="marker" name="@1@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+              <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@1@0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="255,255,255,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,255,0,255" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0.5" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="1" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="square" name="cap_style"/>
+                    <Option type="QString" value="255,255,255,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="circle" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="0,255,0,255" name="outline_color"/>
+                    <Option type="QString" value="solid" name="outline_style"/>
+                    <Option type="QString" value="0.5" name="outline_width"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="1" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -21316,52 +21318,52 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol is_animated="0" type="line" name="2" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="2">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="2;1;1;1" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,255,0,255" type="QString" name="line_color"/>
-                <Option value="dash dot dot" type="QString" name="line_style"/>
-                <Option value="0.75" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="1" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="2;1;1;1" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,255,0,255" name="line_color"/>
+                <Option type="QString" value="dash dot dot" name="line_style"/>
+                <Option type="QString" value="0.75" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="1" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -21392,41 +21394,41 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="outlineStyle">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="250" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="25" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="Interval" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="250" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="25" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="Interval" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -21446,46 +21448,46 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="enabled">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" type="marker" name="@2@1" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+              <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@2@1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="0,255,0,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="35,35,35,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="3.5" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="square" name="cap_style"/>
+                    <Option type="QString" value="0,255,0,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="filled_arrowhead" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="35,35,35,0" name="outline_color"/>
+                    <Option type="QString" value="solid" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="3.5" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -21508,58 +21510,58 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="outlineStyle">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="int" value="1" name="type"/>
+                          <Option type="QString" value="" name="val"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol is_animated="0" type="line" name="3" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="3">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="3;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,255,0,255" type="QString" name="line_color"/>
-                <Option value="dash" type="QString" name="line_style"/>
-                <Option value="0.75" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="1" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="3;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,255,0,255" name="line_color"/>
+                <Option type="QString" value="dash" name="line_style"/>
+                <Option type="QString" value="0.75" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="1" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -21590,41 +21592,41 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="outlineStyle">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="250" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="25" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="Interval" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="250" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="25" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="Interval" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -21644,46 +21646,46 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="enabled">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" type="marker" name="@3@1" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+              <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@3@1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="0,255,0,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="35,35,35,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="3.5" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="square" name="cap_style"/>
+                    <Option type="QString" value="0,255,0,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="filled_arrowhead" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="35,35,35,0" name="outline_color"/>
+                    <Option type="QString" value="solid" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="3.5" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -21706,58 +21708,58 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="outlineStyle">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="int" value="1" name="type"/>
+                          <Option type="QString" value="" name="val"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol is_animated="0" type="line" name="4" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="4">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="255,0,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.75" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="255,0,0,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.75" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -21788,20 +21790,20 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="outlineStyle">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -21810,32 +21812,32 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="50" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="1" fieldName="times" useSubstitutions="0" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="9" namedStyle="Regular" forcedItalic="0" isExpression="0" fontSizeUnit="Point" allowHtml="0" legendString="Aa">
+          <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="Regular" fontUnderline="0" fieldName="times" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" useSubstitutions="0" fontWeight="50" fontStrikeout="0" fontItalic="0" fontSize="9" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" isExpression="0" legendString="Aa" textOrientation="horizontal">
             <families/>
-            <text-buffer bufferNoFill="1" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferDraw="1" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="0"/>
-            <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeBorderWidth="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-              <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <text-buffer bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+            <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskType="0"/>
+            <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
+              <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                    <Option value="255,255,255,255" type="QString" name="color"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                    <Option value="no" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="solid" type="QString" name="style"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                    <Option type="QString" value="255,255,255,255" name="color"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                    <Option type="QString" value="no" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="solid" name="style"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -21850,67 +21852,67 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+            <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format useMaxLineLengthForAutoWrap="1" leftDirectionSymbol="&lt;" wrapChar="" multilineAlign="4294967295" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" decimals="3" rightDirectionSymbol=">" formatNumbers="0"/>
-          <placement overlapHandling="PreventOverlap" lineAnchorType="0" centroidInside="0" overrunDistance="0" centroidWhole="0" geometryGeneratorEnabled="0" rotationAngle="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" geometryGeneratorType="PointGeometry" quadOffset="4" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="2" xOffset="0" allowDegraded="0" lineAnchorTextPoint="CenterOfText" layerType="UnknownGeometry" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" maxCurvedCharAngleOut="-25" repeatDistance="0" offsetUnits="MM" repeatDistanceUnits="MM" dist="0" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" distUnits="MM" lineAnchorClipping="0" placementFlags="10" priority="5" overrunDistanceUnit="MM" maxCurvedCharAngleIn="25" geometryGenerator="" lineAnchorPercent="0.5" yOffset="0" rotationUnit="AngleDegrees"/>
-          <rendering fontMaxPixelSize="10000" drawLabels="1" mergeLines="0" zIndex="0" upsidedownLabels="0" obstacleFactor="1" scaleVisibility="0" limitNumLabels="0" obstacleType="0" fontLimitPixelSize="0" maxNumLabels="2000" minFeatureSize="0" fontMinPixelSize="3" labelPerPart="0" obstacle="1" scaleMax="0" scaleMin="0" unplacedVisibility="0"/>
+          <text-format wrapChar="" rightDirectionSymbol=">" plussign="0" leftDirectionSymbol="&lt;" formatNumbers="0" decimals="3" multilineAlign="4294967295" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
+          <placement offsetUnits="MM" xOffset="0" maxCurvedCharAngleOut="-25" layerType="UnknownGeometry" allowDegraded="0" yOffset="0" overlapHandling="PreventOverlap" geometryGeneratorType="PointGeometry" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" repeatDistanceUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25" quadOffset="4" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidWhole="0" overrunDistance="0" overrunDistanceUnit="MM" centroidInside="0" placement="2" geometryGenerator="" priority="5" distUnits="MM" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" dist="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorTextPoint="CenterOfText" polygonPlacementFlags="2" rotationUnit="AngleDegrees" offsetType="0" placementFlags="10" repeatDistance="0"/>
+          <rendering limitNumLabels="0" obstacleType="0" obstacle="1" scaleMax="0" maxNumLabels="2000" labelPerPart="0" scaleMin="0" upsidedownLabels="0" zIndex="0" unplacedVisibility="0" fontLimitPixelSize="0" minFeatureSize="0" fontMaxPixelSize="10000" scaleVisibility="0" fontMinPixelSize="3" drawLabels="1" mergeLines="0" obstacleFactor="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-              <Option value="0" type="int" name="blendMode"/>
+              <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+              <Option type="int" value="0" name="blendMode"/>
               <Option type="Map" name="ddProperties">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
-              <Option value="false" type="bool" name="drawToAllParts"/>
-              <Option value="0" type="QString" name="enabled"/>
-              <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-              <Option value="&lt;symbol is_animated=&quot;0&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-              <Option value="0" type="double" name="minLength"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-              <Option value="MM" type="QString" name="minLengthUnit"/>
-              <Option value="0" type="double" name="offsetFromAnchor"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-              <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-              <Option value="0" type="double" name="offsetFromLabel"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-              <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+              <Option type="bool" value="false" name="drawToAllParts"/>
+              <Option type="QString" value="0" name="enabled"/>
+              <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
+              <Option type="QString" value="&lt;symbol alpha=&quot;1&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
+              <Option type="double" value="0" name="minLength"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
+              <Option type="QString" value="MM" name="minLengthUnit"/>
+              <Option type="double" value="0" name="offsetFromAnchor"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
+              <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
+              <Option type="double" value="0" name="offsetFromLabel"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
+              <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option value="id" type="QString" name="dualview/previewExpressions"/>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="QString" value="copy" name="QFieldSync/action"/>
+          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="id" name="dualview/previewExpressions"/>
+          <Option type="QString" value="0" name="embeddedWidgets/count"/>
           <Option type="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -21918,48 +21920,48 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory penAlpha="255" width="15" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" minimumSize="0" enabled="0" maxScaleDenominator="1e+08" diagramOrientation="Up" opacity="1" scaleBasedVisibility="0" spacingUnit="MM" minScaleDenominator="0" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" lineSizeType="MM" penWidth="0" backgroundAlpha="255" scaleDependency="Area" spacing="0" direction="1" barWidth="5" sizeType="MM" height="15" penColor="#000000" showAxis="0">
-          <fontProperties bold="0" style="0" italic="1" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" strikethrough="0"/>
-          <attribute label="" colorOpacity="1" field="" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory height="15" scaleDependency="Area" width="15" lineSizeScale="3x:0,0,0,0,0,0" spacingUnit="MM" lineSizeType="MM" penColor="#000000" spacing="0" labelPlacementMethod="XHeight" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" backgroundAlpha="255" maxScaleDenominator="1e+08" barWidth="5" penWidth="0" minimumSize="0" penAlpha="255" minScaleDenominator="0" sizeType="MM" backgroundColor="#ffffff" enabled="0" opacity="1" direction="1" scaleBasedVisibility="0" showAxis="0" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270">
+          <fontProperties style="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" strikethrough="0" italic="1" underline="0" bold="0"/>
+          <attribute color="#000000" field="" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="35,35,35,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0.26" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -21990,9 +21992,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -22000,20 +22002,20 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" showAll="1" placement="2" zIndex="0" dist="0" priority="0" obstacle="0">
+      <DiagramLayerSettings priority="0" linePlacementFlags="18" obstacle="0" dist="0" zIndex="0" placement="2" showAll="1">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field configurationFlags="None" name="id">
@@ -22046,40 +22048,40 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
-        <alias index="1" name="" field="type"/>
-        <alias index="2" name="" field="status"/>
-        <alias index="3" name="" field="times"/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="type" name=""/>
+        <alias index="2" field="status" name=""/>
+        <alias index="3" field="times" name=""/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="type"/>
-        <default applyOnUpdate="0" expression="" field="status"/>
-        <default applyOnUpdate="0" expression="" field="times"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="type" expression=""/>
+        <default applyOnUpdate="0" field="status" expression=""/>
+        <default applyOnUpdate="0" field="times" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="id" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="type" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="status" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="times" constraints="0"/>
+        <constraint exp_strength="0" field="id" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="type" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="status" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="times" notnull_strength="0" constraints="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" desc="" field="id"/>
-        <constraint exp="" desc="" field="type"/>
-        <constraint exp="" desc="" field="status"/>
-        <constraint exp="" desc="" field="times"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="type" desc=""/>
+        <constraint exp="" field="status" desc=""/>
+        <constraint exp="" field="times" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="&quot;id&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="&quot;id&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column width="-1" type="field" name="id" hidden="0"/>
-          <column width="202" type="field" name="type" hidden="0"/>
+          <column width="-1" type="field" hidden="0" name="id"/>
+          <column width="202" type="field" hidden="0" name="type"/>
           <column width="-1" type="actions" hidden="1"/>
-          <column width="-1" type="field" name="status" hidden="0"/>
-          <column width="-1" type="field" name="times" hidden="0"/>
+          <column width="-1" type="field" hidden="0" name="status"/>
+          <column width="-1" type="field" hidden="0" name="times"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -22111,16 +22113,16 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="id" editable="1"/>
-        <field name="status" editable="1"/>
-        <field name="times" editable="1"/>
-        <field name="type" editable="1"/>
+        <field editable="1" name="id"/>
+        <field editable="1" name="status"/>
+        <field editable="1" name="times"/>
+        <field editable="1" name="type"/>
       </editable>
       <labelOnTop>
-        <field name="id" labelOnTop="0"/>
-        <field name="status" labelOnTop="0"/>
-        <field name="times" labelOnTop="0"/>
-        <field name="type" labelOnTop="0"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="status"/>
+        <field labelOnTop="0" name="times"/>
+        <field labelOnTop="0" name="type"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -22128,20 +22130,20 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" simplifyLocal="1" autoRefreshTime="0" wkbType="Point" simplifyDrawingHints="0" type="vector" symbologyReferenceScale="-1" minScale="100000000" legendPlaceholderImage="" refreshOnNotifyEnabled="0" labelsEnabled="1" maxScale="100000" styleCategories="AllStyleCategories" simplifyAlgorithm="0" refreshOnNotifyMessage="" readOnly="0" geometry="Point" autoRefreshEnabled="0" simplifyDrawingTol="1">
+    <maplayer simplifyLocal="1" simplifyDrawingHints="0" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1" legendPlaceholderImage="" symbologyReferenceScale="-1" readOnly="0" refreshOnNotifyEnabled="0" minScale="100000000" maxScale="100000" type="vector" autoRefreshTime="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="1" styleCategories="AllStyleCategories" geometry="Point" autoRefreshEnabled="0" wkbType="Point">
       <extent>
-        <xmin>18.37568241336308006</xmin>
+        <xmin>18.37568931513334292</xmin>
         <ymin>-33.95582126985814853</ymin>
         <xmax>18.42275999405387665</xmax>
         <ymax>-33.8998161888264562</ymax>
       </extent>
       <wgs84extent>
-        <xmin>18.37568241336308006</xmin>
+        <xmin>18.37568931513334292</xmin>
         <ymin>-33.95582126985814853</ymin>
         <xmax>18.42275999405387665</xmax>
         <ymax>-33.8998161888264562</ymax>
       </wgs84extent>
-      <id>route_markers_d58f7174_b6d0_4e1c_80ed_0d74635b8ca6</id>
+      <id>route_markers_4e92bf25_f500_4b5f_bf49_9dd0b475a0c9</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>
@@ -22167,6 +22169,15 @@ def my_form_open(dialog, layer, feature):
         <type></type>
         <title></title>
         <abstract></abstract>
+        <contact>
+          <name></name>
+          <organization></organization>
+          <position></position>
+          <voice></voice>
+          <fax></fax>
+          <email></email>
+          <role></role>
+        </contact>
         <links/>
         <fees></fees>
         <encoding></encoding>
@@ -22183,7 +22194,15 @@ def my_form_open(dialog, layer, feature):
             <geographicflag>false</geographicflag>
           </spatialrefsys>
         </crs>
-        <extent/>
+        <extent>
+          <spatial maxz="0" minx="0" maxx="0" minz="0" crs="" miny="0" maxy="0" dimensions="2"/>
+          <temporal>
+            <period>
+              <start></start>
+              <end></end>
+            </period>
+          </temporal>
+        </extent>
       </resourceMetadata>
       <provider encoding="">memory</provider>
       <vectorjoins/>
@@ -22201,58 +22220,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" startExpression="" mode="0" limitMode="0" endField="" fixedDuration="0" accumulate="0" durationUnit="min" startField="" endExpression="" enabled="0">
+      <temporal durationField="" fixedDuration="0" accumulate="0" endField="" startField="" enabled="0" startExpression="" endExpression="" durationUnit="min" mode="0" limitMode="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" zscale="1" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" binding="Centroid" type="IndividualFeatures" symbology="Line" extrusion="0" zoffset="0">
+      <elevation extrusionEnabled="0" symbology="Line" type="IndividualFeatures" zscale="1" clamping="Terrain" showMarkerSymbolInSurfacePlots="0" zoffset="0" extrusion="0" respectLayerSymbol="1" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="225,89,137,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="225,89,137,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -22283,36 +22302,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="225,89,137,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="161,64,98,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="225,89,137,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="161,64,98,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="225,89,137,255"/>
@@ -22327,44 +22346,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="225,89,137,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="161,64,98,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="225,89,137,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="diamond" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="161,64,98,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="3" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -22387,54 +22406,54 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" type="nullSymbol" symbollevels="0" referencescale="-1" enableorderby="0"/>
+      <renderer-v2 enableorderby="0" type="nullSymbol" symbollevels="0" referencescale="-1" forceraster="0"/>
       <labeling type="rule-based">
-        <rules key="{cde085cc-58f2-4c49-a2cc-2614d5832170}">
-          <rule filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal$)' )" description="Active routes" key="{95db1799-9de4-4074-994e-29c2f4e9f52f}">
+        <rules key="{4da76d50-b431-43d2-8f08-7664d5762a1c}">
+          <rule description="Active routes" key="{f3d8c637-3bb6-4249-ba55-f0c57bee5e55}" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal$)' )">
             <settings calloutType="simple">
-              <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="63" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="255,255,255,255" textOpacity="1" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" useSubstitutions="0" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="10" namedStyle="Semibold" forcedItalic="0" isExpression="1" fontSizeUnit="Point" allowHtml="0" legendString="Aa">
+              <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="Semibold" fontUnderline="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" useSubstitutions="0" fontWeight="63" fontStrikeout="0" fontItalic="0" fontSize="10" allowHtml="0" fontKerning="1" textColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" isExpression="1" legendString="Aa" textOrientation="horizontal">
                 <families/>
-                <text-buffer bufferNoFill="0" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="0"/>
-                <background shapeRadiiY="1" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="0,0,0,255" shapeDraw="1" shapeBorderWidth="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="1" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="0,0,0,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="1" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-                  <symbol is_animated="0" type="marker" name="markerSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+                <text-buffer bufferNoFill="0" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+                <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskType="0"/>
+                <background shapeRadiiY="1" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="0,0,0,255" shapeRotationType="0" shapeSizeX="1" shapeDraw="1" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="0,0,0,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="1">
+                  <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="markerSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                    <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
                       <Option type="Map">
-                        <Option value="0" type="QString" name="angle"/>
-                        <Option value="square" type="QString" name="cap_style"/>
-                        <Option value="213,180,60,255" type="QString" name="color"/>
-                        <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="circle" type="QString" name="name"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="diameter" type="QString" name="scale_method"/>
-                        <Option value="2" type="QString" name="size"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="size_unit"/>
-                        <Option value="1" type="QString" name="vertical_anchor_point"/>
+                        <Option type="QString" value="0" name="angle"/>
+                        <Option type="QString" value="square" name="cap_style"/>
+                        <Option type="QString" value="213,180,60,255" name="color"/>
+                        <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="circle" name="name"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="diameter" name="scale_method"/>
+                        <Option type="QString" value="2" name="size"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="size_unit"/>
+                        <Option type="QString" value="1" name="vertical_anchor_point"/>
                       </Option>
                       <prop k="angle" v="0"/>
                       <prop k="cap_style" v="square"/>
@@ -22457,34 +22476,34 @@ def my_form_open(dialog, layer, feature):
                       <prop k="vertical_anchor_point" v="1"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+                  <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="0,0,0,255" type="QString" name="color"/>
-                        <Option value="round" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="1" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="0,0,0,255" name="color"/>
+                        <Option type="QString" value="round" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="1" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="0,0,0,255"/>
@@ -22499,138 +22518,138 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option value="true" type="bool" name="active"/>
-                              <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                              <Option value="3" type="int" name="type"/>
+                              <Option type="bool" value="true" name="active"/>
+                              <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
+                              <Option type="int" value="3" name="type"/>
                             </Option>
                             <Option type="Map" name="outlineColor">
-                              <Option value="true" type="bool" name="active"/>
-                              <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                              <Option value="3" type="int" name="type"/>
+                              <Option type="bool" value="true" name="active"/>
+                              <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
+                              <Option type="int" value="3" name="type"/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format useMaxLineLengthForAutoWrap="1" leftDirectionSymbol="&lt;" wrapChar="" multilineAlign="3" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" decimals="0" rightDirectionSymbol=">" formatNumbers="0"/>
-              <placement overlapHandling="AllowOverlapIfRequired" lineAnchorType="0" centroidInside="0" overrunDistance="0" centroidWhole="0" geometryGeneratorEnabled="0" rotationAngle="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" geometryGeneratorType="PointGeometry" quadOffset="3" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="6" xOffset="0" allowDegraded="1" lineAnchorTextPoint="CenterOfText" layerType="PointGeometry" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" maxCurvedCharAngleOut="-20" repeatDistance="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" dist="2" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" distUnits="MM" lineAnchorClipping="0" placementFlags="10" priority="10" overrunDistanceUnit="MM" maxCurvedCharAngleIn="20" geometryGenerator="" lineAnchorPercent="0.5" yOffset="0" rotationUnit="AngleDegrees"/>
-              <rendering fontMaxPixelSize="10000" drawLabels="1" mergeLines="0" zIndex="0" upsidedownLabels="0" obstacleFactor="2" scaleVisibility="0" limitNumLabels="0" obstacleType="0" fontLimitPixelSize="0" maxNumLabels="2000" minFeatureSize="0" fontMinPixelSize="3" labelPerPart="0" obstacle="1" scaleMax="10000000" scaleMin="1" unplacedVisibility="0"/>
+              <text-format wrapChar="" rightDirectionSymbol=">" plussign="0" leftDirectionSymbol="&lt;" formatNumbers="0" decimals="0" multilineAlign="3" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
+              <placement offsetUnits="MapUnit" xOffset="0" maxCurvedCharAngleOut="-20" layerType="PointGeometry" allowDegraded="1" yOffset="0" overlapHandling="AllowOverlapIfRequired" geometryGeneratorType="PointGeometry" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" repeatDistanceUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" quadOffset="3" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidWhole="0" overrunDistance="0" overrunDistanceUnit="MM" centroidInside="0" placement="6" geometryGenerator="" priority="10" distUnits="MM" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" dist="2" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorTextPoint="CenterOfText" polygonPlacementFlags="2" rotationUnit="AngleDegrees" offsetType="0" placementFlags="10" repeatDistance="0"/>
+              <rendering limitNumLabels="0" obstacleType="0" obstacle="1" scaleMax="10000000" maxNumLabels="2000" labelPerPart="0" scaleMin="1" upsidedownLabels="0" zIndex="0" unplacedVisibility="0" fontLimitPixelSize="0" minFeatureSize="0" fontMaxPixelSize="10000" scaleVisibility="0" fontMinPixelSize="3" drawLabels="1" mergeLines="0" obstacleFactor="2"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="PositionX">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="PositionY">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="PredefinedPositionOrder">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="quadrant" type="QString" name="field"/>
-                      <Option value="2" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="quadrant" name="field"/>
+                      <Option type="int" value="2" name="type"/>
                     </Option>
                     <Option type="Map" name="Rotation">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="rotation" type="QString" name="field"/>
-                      <Option value="2" type="int" name="type"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="QString" value="rotation" name="field"/>
+                      <Option type="int" value="2" name="type"/>
                     </Option>
                     <Option type="Map" name="ShapeBorderColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="ShapeFillColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+                  <Option type="int" value="0" name="blendMode"/>
                   <Option type="Map" name="ddProperties">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
-                  <Option value="false" type="bool" name="drawToAllParts"/>
-                  <Option value="0" type="QString" name="enabled"/>
-                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                  <Option value="&lt;symbol is_animated=&quot;0&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                  <Option value="0" type="double" name="minLength"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                  <Option value="MM" type="QString" name="minLengthUnit"/>
-                  <Option value="0" type="double" name="offsetFromAnchor"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                  <Option value="0" type="double" name="offsetFromLabel"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                  <Option type="bool" value="false" name="drawToAllParts"/>
+                  <Option type="QString" value="0" name="enabled"/>
+                  <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
+                  <Option type="QString" value="&lt;symbol alpha=&quot;1&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
+                  <Option type="double" value="0" name="minLength"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
+                  <Option type="QString" value="MM" name="minLengthUnit"/>
+                  <Option type="double" value="0" name="offsetFromAnchor"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
+                  <Option type="double" value="0" name="offsetFromLabel"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule filter="regexp_match( attribute( @atlas_feature , 'type' ), '^marshal (plan|overview)' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" description="Show by day" key="{379f64c2-b5f6-4f7d-a33c-c6a10b65e7ef}">
+          <rule description="Show by day" key="{839f054f-e86d-4118-a253-e1d5c81234fa}" filter="regexp_match( attribute( @atlas_feature , 'type' ), '^marshal (plan|overview)' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )">
             <settings calloutType="simple">
-              <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="63" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="255,255,255,255" textOpacity="1" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" useSubstitutions="0" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="10" namedStyle="Semibold" forcedItalic="0" isExpression="1" fontSizeUnit="Point" allowHtml="0" legendString="Aa">
+              <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="Semibold" fontUnderline="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" useSubstitutions="0" fontWeight="63" fontStrikeout="0" fontItalic="0" fontSize="10" allowHtml="0" fontKerning="1" textColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" isExpression="1" legendString="Aa" textOrientation="horizontal">
                 <families/>
-                <text-buffer bufferNoFill="0" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="0"/>
-                <background shapeRadiiY="1" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="0,0,0,255" shapeDraw="1" shapeBorderWidth="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="1" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="0,0,0,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="1" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-                  <symbol is_animated="0" type="marker" name="markerSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+                <text-buffer bufferNoFill="0" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+                <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskType="0"/>
+                <background shapeRadiiY="1" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="0,0,0,255" shapeRotationType="0" shapeSizeX="1" shapeDraw="1" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="0,0,0,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="1">
+                  <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="markerSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                    <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
                       <Option type="Map">
-                        <Option value="0" type="QString" name="angle"/>
-                        <Option value="square" type="QString" name="cap_style"/>
-                        <Option value="213,180,60,255" type="QString" name="color"/>
-                        <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="circle" type="QString" name="name"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="diameter" type="QString" name="scale_method"/>
-                        <Option value="2" type="QString" name="size"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="size_unit"/>
-                        <Option value="1" type="QString" name="vertical_anchor_point"/>
+                        <Option type="QString" value="0" name="angle"/>
+                        <Option type="QString" value="square" name="cap_style"/>
+                        <Option type="QString" value="213,180,60,255" name="color"/>
+                        <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="circle" name="name"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="diameter" name="scale_method"/>
+                        <Option type="QString" value="2" name="size"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="size_unit"/>
+                        <Option type="QString" value="1" name="vertical_anchor_point"/>
                       </Option>
                       <prop k="angle" v="0"/>
                       <prop k="cap_style" v="square"/>
@@ -22653,34 +22672,34 @@ def my_form_open(dialog, layer, feature):
                       <prop k="vertical_anchor_point" v="1"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+                  <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="0,0,0,255" type="QString" name="color"/>
-                        <Option value="round" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="1" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="0,0,0,255" name="color"/>
+                        <Option type="QString" value="round" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="1" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="0,0,0,255"/>
@@ -22695,131 +22714,131 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option value="true" type="bool" name="active"/>
-                              <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                              <Option value="3" type="int" name="type"/>
+                              <Option type="bool" value="true" name="active"/>
+                              <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
+                              <Option type="int" value="3" name="type"/>
                             </Option>
                             <Option type="Map" name="outlineColor">
-                              <Option value="true" type="bool" name="active"/>
-                              <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                              <Option value="3" type="int" name="type"/>
+                              <Option type="bool" value="true" name="active"/>
+                              <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
+                              <Option type="int" value="3" name="type"/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format useMaxLineLengthForAutoWrap="1" leftDirectionSymbol="&lt;" wrapChar="" multilineAlign="3" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" decimals="0" rightDirectionSymbol=">" formatNumbers="0"/>
-              <placement overlapHandling="AllowOverlapIfRequired" lineAnchorType="0" centroidInside="0" overrunDistance="0" centroidWhole="0" geometryGeneratorEnabled="0" rotationAngle="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" geometryGeneratorType="PointGeometry" quadOffset="3" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="6" xOffset="0" allowDegraded="1" lineAnchorTextPoint="CenterOfText" layerType="PointGeometry" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" maxCurvedCharAngleOut="-20" repeatDistance="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" dist="2" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" distUnits="MM" lineAnchorClipping="0" placementFlags="10" priority="10" overrunDistanceUnit="MM" maxCurvedCharAngleIn="20" geometryGenerator="" lineAnchorPercent="0.5" yOffset="0" rotationUnit="AngleDegrees"/>
-              <rendering fontMaxPixelSize="10000" drawLabels="1" mergeLines="0" zIndex="0" upsidedownLabels="0" obstacleFactor="2" scaleVisibility="0" limitNumLabels="0" obstacleType="0" fontLimitPixelSize="0" maxNumLabels="2000" minFeatureSize="0" fontMinPixelSize="3" labelPerPart="0" obstacle="1" scaleMax="10000000" scaleMin="1" unplacedVisibility="0"/>
+              <text-format wrapChar="" rightDirectionSymbol=">" plussign="0" leftDirectionSymbol="&lt;" formatNumbers="0" decimals="0" multilineAlign="3" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
+              <placement offsetUnits="MapUnit" xOffset="0" maxCurvedCharAngleOut="-20" layerType="PointGeometry" allowDegraded="1" yOffset="0" overlapHandling="AllowOverlapIfRequired" geometryGeneratorType="PointGeometry" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" repeatDistanceUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" quadOffset="3" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidWhole="0" overrunDistance="0" overrunDistanceUnit="MM" centroidInside="0" placement="6" geometryGenerator="" priority="10" distUnits="MM" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" dist="2" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorTextPoint="CenterOfText" polygonPlacementFlags="2" rotationUnit="AngleDegrees" offsetType="0" placementFlags="10" repeatDistance="0"/>
+              <rendering limitNumLabels="0" obstacleType="0" obstacle="1" scaleMax="10000000" maxNumLabels="2000" labelPerPart="0" scaleMin="1" upsidedownLabels="0" zIndex="0" unplacedVisibility="0" fontLimitPixelSize="0" minFeatureSize="0" fontMaxPixelSize="10000" scaleVisibility="0" fontMinPixelSize="3" drawLabels="1" mergeLines="0" obstacleFactor="2"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="PositionX">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="PositionY">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="PredefinedPositionOrder">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="quadrant" type="QString" name="field"/>
-                      <Option value="2" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="quadrant" name="field"/>
+                      <Option type="int" value="2" name="type"/>
                     </Option>
                     <Option type="Map" name="Rotation">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="rotation" type="QString" name="field"/>
-                      <Option value="2" type="int" name="type"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="QString" value="rotation" name="field"/>
+                      <Option type="int" value="2" name="type"/>
                     </Option>
                     <Option type="Map" name="ShapeBorderColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="ShapeFillColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+                  <Option type="int" value="0" name="blendMode"/>
                   <Option type="Map" name="ddProperties">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
-                  <Option value="false" type="bool" name="drawToAllParts"/>
-                  <Option value="0" type="QString" name="enabled"/>
-                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                  <Option value="&lt;symbol is_animated=&quot;0&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                  <Option value="0" type="double" name="minLength"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                  <Option value="MM" type="QString" name="minLengthUnit"/>
-                  <Option value="0" type="double" name="offsetFromAnchor"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                  <Option value="0" type="double" name="offsetFromLabel"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                  <Option type="bool" value="false" name="drawToAllParts"/>
+                  <Option type="QString" value="0" name="enabled"/>
+                  <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
+                  <Option type="QString" value="&lt;symbol alpha=&quot;1&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
+                  <Option type="double" value="0" name="minLength"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
+                  <Option type="QString" value="MM" name="minLengthUnit"/>
+                  <Option type="double" value="0" name="offsetFromAnchor"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
+                  <Option type="double" value="0" name="offsetFromLabel"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule active="0" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" description="List for legends" key="{72924649-3eef-4d1a-8529-de69270205d9}">
-            <rule active="0" filter="&quot;Source&quot; = '21KM'" description="21KM" key="{e7facde6-7dab-47b6-82a7-d1c25c9249a4}">
+          <rule description="List for legends" active="0" key="{905e8a77-980c-42e8-94ac-662ad263ccb8}" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )">
+            <rule description="21KM" active="0" key="{9ed61d0c-920f-41ee-848c-d0202cb5c55a}" filter="&quot;Source&quot; = '21KM'">
               <settings calloutType="simple">
-                <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="63" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="255,255,255,255" textOpacity="1" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" useSubstitutions="0" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="10" namedStyle="Semibold" forcedItalic="0" isExpression="1" fontSizeUnit="Point" allowHtml="0" legendString="Aa">
+                <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="Semibold" fontUnderline="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" useSubstitutions="0" fontWeight="63" fontStrikeout="0" fontItalic="0" fontSize="10" allowHtml="0" fontKerning="1" textColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" isExpression="1" legendString="Aa" textOrientation="horizontal">
                   <families/>
-                  <text-buffer bufferNoFill="0" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                  <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="0"/>
-                  <background shapeRadiiY="1" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="210,32,39,255" shapeDraw="1" shapeBorderWidth="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="1" shapeType="0" shapeJoinStyle="128" shapeOffsetUnit="MM" shapeBorderColor="210,32,39,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="1" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-                    <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+                  <text-buffer bufferNoFill="0" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+                  <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskType="0"/>
+                  <background shapeRadiiY="1" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="210,32,39,255" shapeRotationType="0" shapeSizeX="1" shapeDraw="1" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="128" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="210,32,39,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="1">
+                    <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
-                      <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                      <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                         <Option type="Map">
-                          <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                          <Option value="210,32,39,255" type="QString" name="color"/>
-                          <Option value="round" type="QString" name="joinstyle"/>
-                          <Option value="0,0" type="QString" name="offset"/>
-                          <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                          <Option value="MM" type="QString" name="offset_unit"/>
-                          <Option value="210,32,39,255" type="QString" name="outline_color"/>
-                          <Option value="solid" type="QString" name="outline_style"/>
-                          <Option value="1" type="QString" name="outline_width"/>
-                          <Option value="MM" type="QString" name="outline_width_unit"/>
-                          <Option value="solid" type="QString" name="style"/>
+                          <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                          <Option type="QString" value="210,32,39,255" name="color"/>
+                          <Option type="QString" value="round" name="joinstyle"/>
+                          <Option type="QString" value="0,0" name="offset"/>
+                          <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                          <Option type="QString" value="MM" name="offset_unit"/>
+                          <Option type="QString" value="210,32,39,255" name="outline_color"/>
+                          <Option type="QString" value="solid" name="outline_style"/>
+                          <Option type="QString" value="1" name="outline_width"/>
+                          <Option type="QString" value="MM" name="outline_width_unit"/>
+                          <Option type="QString" value="solid" name="style"/>
                         </Option>
                         <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                         <prop k="color" v="210,32,39,255"/>
@@ -22834,130 +22853,130 @@ def my_form_open(dialog, layer, feature):
                         <prop k="style" v="solid"/>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option value="" type="QString" name="name"/>
+                            <Option type="QString" value="" name="name"/>
                             <Option name="properties"/>
-                            <Option value="collection" type="QString" name="type"/>
+                            <Option type="QString" value="collection" name="type"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+                  <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
                   <dd_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="PositionX">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="int" value="1" name="type"/>
+                          <Option type="QString" value="" name="val"/>
                         </Option>
                         <Option type="Map" name="PositionY">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="int" value="1" name="type"/>
+                          <Option type="QString" value="" name="val"/>
                         </Option>
                         <Option type="Map" name="PredefinedPositionOrder">
-                          <Option value="true" type="bool" name="active"/>
-                          <Option value="quadrant" type="QString" name="field"/>
-                          <Option value="2" type="int" name="type"/>
+                          <Option type="bool" value="true" name="active"/>
+                          <Option type="QString" value="quadrant" name="field"/>
+                          <Option type="int" value="2" name="type"/>
                         </Option>
                         <Option type="Map" name="Rotation">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="rotation" type="QString" name="field"/>
-                          <Option value="2" type="int" name="type"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="QString" value="rotation" name="field"/>
+                          <Option type="int" value="2" name="type"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format useMaxLineLengthForAutoWrap="1" leftDirectionSymbol="&lt;" wrapChar="" multilineAlign="3" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" decimals="0" rightDirectionSymbol=">" formatNumbers="0"/>
-                <placement overlapHandling="AllowOverlapIfRequired" lineAnchorType="0" centroidInside="0" overrunDistance="0" centroidWhole="0" geometryGeneratorEnabled="0" rotationAngle="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" geometryGeneratorType="PointGeometry" quadOffset="3" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="6" xOffset="0" allowDegraded="1" lineAnchorTextPoint="CenterOfText" layerType="UnknownGeometry" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" maxCurvedCharAngleOut="-20" repeatDistance="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" dist="2" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" distUnits="MM" lineAnchorClipping="0" placementFlags="10" priority="10" overrunDistanceUnit="MM" maxCurvedCharAngleIn="20" geometryGenerator="" lineAnchorPercent="0.5" yOffset="0" rotationUnit="AngleDegrees"/>
-                <rendering fontMaxPixelSize="10000" drawLabels="1" mergeLines="0" zIndex="0" upsidedownLabels="0" obstacleFactor="2" scaleVisibility="0" limitNumLabels="0" obstacleType="0" fontLimitPixelSize="0" maxNumLabels="2000" minFeatureSize="0" fontMinPixelSize="3" labelPerPart="0" obstacle="1" scaleMax="10000000" scaleMin="1" unplacedVisibility="0"/>
+                <text-format wrapChar="" rightDirectionSymbol=">" plussign="0" leftDirectionSymbol="&lt;" formatNumbers="0" decimals="0" multilineAlign="3" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
+                <placement offsetUnits="MapUnit" xOffset="0" maxCurvedCharAngleOut="-20" layerType="UnknownGeometry" allowDegraded="1" yOffset="0" overlapHandling="AllowOverlapIfRequired" geometryGeneratorType="PointGeometry" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" repeatDistanceUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" quadOffset="3" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidWhole="0" overrunDistance="0" overrunDistanceUnit="MM" centroidInside="0" placement="6" geometryGenerator="" priority="10" distUnits="MM" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" dist="2" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorTextPoint="CenterOfText" polygonPlacementFlags="2" rotationUnit="AngleDegrees" offsetType="0" placementFlags="10" repeatDistance="0"/>
+                <rendering limitNumLabels="0" obstacleType="0" obstacle="1" scaleMax="10000000" maxNumLabels="2000" labelPerPart="0" scaleMin="1" upsidedownLabels="0" zIndex="0" unplacedVisibility="0" fontLimitPixelSize="0" minFeatureSize="0" fontMaxPixelSize="10000" scaleVisibility="0" fontMinPixelSize="3" drawLabels="1" mergeLines="0" obstacleFactor="2"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option type="Map" name="properties">
                       <Option type="Map" name="PositionX">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
+                        <Option type="bool" value="false" name="active"/>
+                        <Option type="int" value="1" name="type"/>
+                        <Option type="QString" value="" name="val"/>
                       </Option>
                       <Option type="Map" name="PositionY">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
+                        <Option type="bool" value="false" name="active"/>
+                        <Option type="int" value="1" name="type"/>
+                        <Option type="QString" value="" name="val"/>
                       </Option>
                       <Option type="Map" name="PredefinedPositionOrder">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="quadrant" type="QString" name="field"/>
-                        <Option value="2" type="int" name="type"/>
+                        <Option type="bool" value="true" name="active"/>
+                        <Option type="QString" value="quadrant" name="field"/>
+                        <Option type="int" value="2" name="type"/>
                       </Option>
                       <Option type="Map" name="Rotation">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="rotation" type="QString" name="field"/>
-                        <Option value="2" type="int" name="type"/>
+                        <Option type="bool" value="false" name="active"/>
+                        <Option type="QString" value="rotation" name="field"/>
+                        <Option type="int" value="2" name="type"/>
                       </Option>
                     </Option>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </dd_properties>
                 <callout type="simple">
                   <Option type="Map">
-                    <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                    <Option value="0" type="int" name="blendMode"/>
+                    <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+                    <Option type="int" value="0" name="blendMode"/>
                     <Option type="Map" name="ddProperties">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
-                    <Option value="false" type="bool" name="drawToAllParts"/>
-                    <Option value="0" type="QString" name="enabled"/>
-                    <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                    <Option value="&lt;symbol is_animated=&quot;0&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                    <Option value="0" type="double" name="minLength"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                    <Option value="MM" type="QString" name="minLengthUnit"/>
-                    <Option value="0" type="double" name="offsetFromAnchor"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                    <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                    <Option value="0" type="double" name="offsetFromLabel"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                    <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                    <Option type="bool" value="false" name="drawToAllParts"/>
+                    <Option type="QString" value="0" name="enabled"/>
+                    <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
+                    <Option type="QString" value="&lt;symbol alpha=&quot;1&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
+                    <Option type="double" value="0" name="minLength"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
+                    <Option type="QString" value="MM" name="minLengthUnit"/>
+                    <Option type="double" value="0" name="offsetFromAnchor"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
+                    <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
+                    <Option type="double" value="0" name="offsetFromLabel"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
+                    <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
                   </Option>
                 </callout>
               </settings>
             </rule>
-            <rule active="0" filter="&quot;Source&quot; = '10KM'" description="10KM" key="{7539ef8a-1068-4b69-a2cc-c8e9b0369bb7}">
+            <rule description="10KM" active="0" key="{b1e8ae3d-36ba-4724-a299-5faba67854ef}" filter="&quot;Source&quot; = '10KM'">
               <settings calloutType="simple">
-                <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="63" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="255,255,255,255" textOpacity="1" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" useSubstitutions="0" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="10" namedStyle="Semibold" forcedItalic="0" isExpression="1" fontSizeUnit="Point" allowHtml="0" legendString="Aa">
+                <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="Semibold" fontUnderline="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" useSubstitutions="0" fontWeight="63" fontStrikeout="0" fontItalic="0" fontSize="10" allowHtml="0" fontKerning="1" textColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" isExpression="1" legendString="Aa" textOrientation="horizontal">
                   <families/>
-                  <text-buffer bufferNoFill="0" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                  <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="0"/>
-                  <background shapeRadiiY="1" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="103,34,144,255" shapeDraw="1" shapeBorderWidth="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="1" shapeType="0" shapeJoinStyle="128" shapeOffsetUnit="MM" shapeBorderColor="103,34,144,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="1" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-                    <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+                  <text-buffer bufferNoFill="0" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+                  <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskType="0"/>
+                  <background shapeRadiiY="1" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="103,34,144,255" shapeRotationType="0" shapeSizeX="1" shapeDraw="1" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="128" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="103,34,144,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="1">
+                    <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
-                      <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                      <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                         <Option type="Map">
-                          <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                          <Option value="103,34,144,255" type="QString" name="color"/>
-                          <Option value="round" type="QString" name="joinstyle"/>
-                          <Option value="0,0" type="QString" name="offset"/>
-                          <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                          <Option value="MM" type="QString" name="offset_unit"/>
-                          <Option value="103,34,144,255" type="QString" name="outline_color"/>
-                          <Option value="solid" type="QString" name="outline_style"/>
-                          <Option value="1" type="QString" name="outline_width"/>
-                          <Option value="MM" type="QString" name="outline_width_unit"/>
-                          <Option value="solid" type="QString" name="style"/>
+                          <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                          <Option type="QString" value="103,34,144,255" name="color"/>
+                          <Option type="QString" value="round" name="joinstyle"/>
+                          <Option type="QString" value="0,0" name="offset"/>
+                          <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                          <Option type="QString" value="MM" name="offset_unit"/>
+                          <Option type="QString" value="103,34,144,255" name="outline_color"/>
+                          <Option type="QString" value="solid" name="outline_style"/>
+                          <Option type="QString" value="1" name="outline_width"/>
+                          <Option type="QString" value="MM" name="outline_width_unit"/>
+                          <Option type="QString" value="solid" name="style"/>
                         </Option>
                         <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                         <prop k="color" v="103,34,144,255"/>
@@ -22972,130 +22991,130 @@ def my_form_open(dialog, layer, feature):
                         <prop k="style" v="solid"/>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option value="" type="QString" name="name"/>
+                            <Option type="QString" value="" name="name"/>
                             <Option name="properties"/>
-                            <Option value="collection" type="QString" name="type"/>
+                            <Option type="QString" value="collection" name="type"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+                  <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
                   <dd_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="PositionX">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="int" value="1" name="type"/>
+                          <Option type="QString" value="" name="val"/>
                         </Option>
                         <Option type="Map" name="PositionY">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="int" value="1" name="type"/>
+                          <Option type="QString" value="" name="val"/>
                         </Option>
                         <Option type="Map" name="PredefinedPositionOrder">
-                          <Option value="true" type="bool" name="active"/>
-                          <Option value="quadrant" type="QString" name="field"/>
-                          <Option value="2" type="int" name="type"/>
+                          <Option type="bool" value="true" name="active"/>
+                          <Option type="QString" value="quadrant" name="field"/>
+                          <Option type="int" value="2" name="type"/>
                         </Option>
                         <Option type="Map" name="Rotation">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="rotation" type="QString" name="field"/>
-                          <Option value="2" type="int" name="type"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="QString" value="rotation" name="field"/>
+                          <Option type="int" value="2" name="type"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format useMaxLineLengthForAutoWrap="1" leftDirectionSymbol="&lt;" wrapChar="" multilineAlign="3" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" decimals="0" rightDirectionSymbol=">" formatNumbers="0"/>
-                <placement overlapHandling="AllowOverlapIfRequired" lineAnchorType="0" centroidInside="0" overrunDistance="0" centroidWhole="0" geometryGeneratorEnabled="0" rotationAngle="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" geometryGeneratorType="PointGeometry" quadOffset="4" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="6" xOffset="0" allowDegraded="1" lineAnchorTextPoint="CenterOfText" layerType="UnknownGeometry" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" maxCurvedCharAngleOut="-20" repeatDistance="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" dist="2" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" distUnits="MM" lineAnchorClipping="0" placementFlags="10" priority="10" overrunDistanceUnit="MM" maxCurvedCharAngleIn="20" geometryGenerator="" lineAnchorPercent="0.5" yOffset="0" rotationUnit="AngleDegrees"/>
-                <rendering fontMaxPixelSize="10000" drawLabels="1" mergeLines="0" zIndex="0" upsidedownLabels="0" obstacleFactor="2" scaleVisibility="0" limitNumLabels="0" obstacleType="0" fontLimitPixelSize="0" maxNumLabels="2000" minFeatureSize="0" fontMinPixelSize="3" labelPerPart="0" obstacle="1" scaleMax="10000000" scaleMin="1" unplacedVisibility="0"/>
+                <text-format wrapChar="" rightDirectionSymbol=">" plussign="0" leftDirectionSymbol="&lt;" formatNumbers="0" decimals="0" multilineAlign="3" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
+                <placement offsetUnits="MapUnit" xOffset="0" maxCurvedCharAngleOut="-20" layerType="UnknownGeometry" allowDegraded="1" yOffset="0" overlapHandling="AllowOverlapIfRequired" geometryGeneratorType="PointGeometry" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" repeatDistanceUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" quadOffset="4" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidWhole="0" overrunDistance="0" overrunDistanceUnit="MM" centroidInside="0" placement="6" geometryGenerator="" priority="10" distUnits="MM" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" dist="2" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorTextPoint="CenterOfText" polygonPlacementFlags="2" rotationUnit="AngleDegrees" offsetType="0" placementFlags="10" repeatDistance="0"/>
+                <rendering limitNumLabels="0" obstacleType="0" obstacle="1" scaleMax="10000000" maxNumLabels="2000" labelPerPart="0" scaleMin="1" upsidedownLabels="0" zIndex="0" unplacedVisibility="0" fontLimitPixelSize="0" minFeatureSize="0" fontMaxPixelSize="10000" scaleVisibility="0" fontMinPixelSize="3" drawLabels="1" mergeLines="0" obstacleFactor="2"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option type="Map" name="properties">
                       <Option type="Map" name="PositionX">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
+                        <Option type="bool" value="false" name="active"/>
+                        <Option type="int" value="1" name="type"/>
+                        <Option type="QString" value="" name="val"/>
                       </Option>
                       <Option type="Map" name="PositionY">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
+                        <Option type="bool" value="false" name="active"/>
+                        <Option type="int" value="1" name="type"/>
+                        <Option type="QString" value="" name="val"/>
                       </Option>
                       <Option type="Map" name="PredefinedPositionOrder">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="quadrant" type="QString" name="field"/>
-                        <Option value="2" type="int" name="type"/>
+                        <Option type="bool" value="true" name="active"/>
+                        <Option type="QString" value="quadrant" name="field"/>
+                        <Option type="int" value="2" name="type"/>
                       </Option>
                       <Option type="Map" name="Rotation">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="rotation" type="QString" name="field"/>
-                        <Option value="2" type="int" name="type"/>
+                        <Option type="bool" value="false" name="active"/>
+                        <Option type="QString" value="rotation" name="field"/>
+                        <Option type="int" value="2" name="type"/>
                       </Option>
                     </Option>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </dd_properties>
                 <callout type="simple">
                   <Option type="Map">
-                    <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                    <Option value="0" type="int" name="blendMode"/>
+                    <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+                    <Option type="int" value="0" name="blendMode"/>
                     <Option type="Map" name="ddProperties">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
-                    <Option value="false" type="bool" name="drawToAllParts"/>
-                    <Option value="0" type="QString" name="enabled"/>
-                    <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                    <Option value="&lt;symbol is_animated=&quot;0&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                    <Option value="0" type="double" name="minLength"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                    <Option value="MM" type="QString" name="minLengthUnit"/>
-                    <Option value="0" type="double" name="offsetFromAnchor"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                    <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                    <Option value="0" type="double" name="offsetFromLabel"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                    <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                    <Option type="bool" value="false" name="drawToAllParts"/>
+                    <Option type="QString" value="0" name="enabled"/>
+                    <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
+                    <Option type="QString" value="&lt;symbol alpha=&quot;1&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
+                    <Option type="double" value="0" name="minLength"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
+                    <Option type="QString" value="MM" name="minLengthUnit"/>
+                    <Option type="double" value="0" name="offsetFromAnchor"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
+                    <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
+                    <Option type="double" value="0" name="offsetFromLabel"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
+                    <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
                   </Option>
                 </callout>
               </settings>
             </rule>
-            <rule active="0" filter="&quot;Source&quot; = '5KM'" description="5KM" key="{8573f5c5-a6be-456b-8bc8-6817ef1a8c90}">
+            <rule description="5KM" active="0" key="{6e7154e1-bcb8-4b17-8bf0-66341d4599dd}" filter="&quot;Source&quot; = '5KM'">
               <settings calloutType="simple">
-                <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="63" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="255,255,255,255" textOpacity="1" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" useSubstitutions="0" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="10" namedStyle="Semibold" forcedItalic="0" isExpression="1" fontSizeUnit="Point" allowHtml="0" legendString="Aa">
+                <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="Semibold" fontUnderline="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" useSubstitutions="0" fontWeight="63" fontStrikeout="0" fontItalic="0" fontSize="10" allowHtml="0" fontKerning="1" textColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" isExpression="1" legendString="Aa" textOrientation="horizontal">
                   <families/>
-                  <text-buffer bufferNoFill="0" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                  <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="0"/>
-                  <background shapeRadiiY="1" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="145,211,55,255" shapeDraw="1" shapeBorderWidth="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="1" shapeType="0" shapeJoinStyle="128" shapeOffsetUnit="MM" shapeBorderColor="145,211,55,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="1" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-                    <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+                  <text-buffer bufferNoFill="0" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+                  <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskType="0"/>
+                  <background shapeRadiiY="1" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="145,211,55,255" shapeRotationType="0" shapeSizeX="1" shapeDraw="1" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="128" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="145,211,55,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="1">
+                    <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
-                      <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                      <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                         <Option type="Map">
-                          <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                          <Option value="145,211,55,255" type="QString" name="color"/>
-                          <Option value="round" type="QString" name="joinstyle"/>
-                          <Option value="0,0" type="QString" name="offset"/>
-                          <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                          <Option value="MM" type="QString" name="offset_unit"/>
-                          <Option value="145,211,55,255" type="QString" name="outline_color"/>
-                          <Option value="solid" type="QString" name="outline_style"/>
-                          <Option value="1" type="QString" name="outline_width"/>
-                          <Option value="MM" type="QString" name="outline_width_unit"/>
-                          <Option value="solid" type="QString" name="style"/>
+                          <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                          <Option type="QString" value="145,211,55,255" name="color"/>
+                          <Option type="QString" value="round" name="joinstyle"/>
+                          <Option type="QString" value="0,0" name="offset"/>
+                          <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                          <Option type="QString" value="MM" name="offset_unit"/>
+                          <Option type="QString" value="145,211,55,255" name="outline_color"/>
+                          <Option type="QString" value="solid" name="outline_style"/>
+                          <Option type="QString" value="1" name="outline_width"/>
+                          <Option type="QString" value="MM" name="outline_width_unit"/>
+                          <Option type="QString" value="solid" name="style"/>
                         </Option>
                         <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                         <prop k="color" v="145,211,55,255"/>
@@ -23110,138 +23129,138 @@ def my_form_open(dialog, layer, feature):
                         <prop k="style" v="solid"/>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option value="" type="QString" name="name"/>
+                            <Option type="QString" value="" name="name"/>
                             <Option name="properties"/>
-                            <Option value="collection" type="QString" name="type"/>
+                            <Option type="QString" value="collection" name="type"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+                  <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
                   <dd_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="PositionX">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="int" value="1" name="type"/>
+                          <Option type="QString" value="" name="val"/>
                         </Option>
                         <Option type="Map" name="PositionY">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="int" value="1" name="type"/>
+                          <Option type="QString" value="" name="val"/>
                         </Option>
                         <Option type="Map" name="PredefinedPositionOrder">
-                          <Option value="true" type="bool" name="active"/>
-                          <Option value="quadrant" type="QString" name="field"/>
-                          <Option value="2" type="int" name="type"/>
+                          <Option type="bool" value="true" name="active"/>
+                          <Option type="QString" value="quadrant" name="field"/>
+                          <Option type="int" value="2" name="type"/>
                         </Option>
                         <Option type="Map" name="Rotation">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="rotation" type="QString" name="field"/>
-                          <Option value="2" type="int" name="type"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="QString" value="rotation" name="field"/>
+                          <Option type="int" value="2" name="type"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format useMaxLineLengthForAutoWrap="1" leftDirectionSymbol="&lt;" wrapChar="" multilineAlign="3" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" decimals="0" rightDirectionSymbol=">" formatNumbers="0"/>
-                <placement overlapHandling="AllowOverlapIfRequired" lineAnchorType="0" centroidInside="0" overrunDistance="0" centroidWhole="0" geometryGeneratorEnabled="0" rotationAngle="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" geometryGeneratorType="PointGeometry" quadOffset="4" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="6" xOffset="0" allowDegraded="1" lineAnchorTextPoint="CenterOfText" layerType="UnknownGeometry" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" maxCurvedCharAngleOut="-20" repeatDistance="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" dist="2" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" distUnits="MM" lineAnchorClipping="0" placementFlags="10" priority="10" overrunDistanceUnit="MM" maxCurvedCharAngleIn="20" geometryGenerator="" lineAnchorPercent="0.5" yOffset="0" rotationUnit="AngleDegrees"/>
-                <rendering fontMaxPixelSize="10000" drawLabels="1" mergeLines="0" zIndex="0" upsidedownLabels="0" obstacleFactor="2" scaleVisibility="0" limitNumLabels="0" obstacleType="0" fontLimitPixelSize="0" maxNumLabels="2000" minFeatureSize="0" fontMinPixelSize="3" labelPerPart="0" obstacle="1" scaleMax="10000000" scaleMin="1" unplacedVisibility="0"/>
+                <text-format wrapChar="" rightDirectionSymbol=">" plussign="0" leftDirectionSymbol="&lt;" formatNumbers="0" decimals="0" multilineAlign="3" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
+                <placement offsetUnits="MapUnit" xOffset="0" maxCurvedCharAngleOut="-20" layerType="UnknownGeometry" allowDegraded="1" yOffset="0" overlapHandling="AllowOverlapIfRequired" geometryGeneratorType="PointGeometry" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" repeatDistanceUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" quadOffset="4" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidWhole="0" overrunDistance="0" overrunDistanceUnit="MM" centroidInside="0" placement="6" geometryGenerator="" priority="10" distUnits="MM" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" dist="2" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorTextPoint="CenterOfText" polygonPlacementFlags="2" rotationUnit="AngleDegrees" offsetType="0" placementFlags="10" repeatDistance="0"/>
+                <rendering limitNumLabels="0" obstacleType="0" obstacle="1" scaleMax="10000000" maxNumLabels="2000" labelPerPart="0" scaleMin="1" upsidedownLabels="0" zIndex="0" unplacedVisibility="0" fontLimitPixelSize="0" minFeatureSize="0" fontMaxPixelSize="10000" scaleVisibility="0" fontMinPixelSize="3" drawLabels="1" mergeLines="0" obstacleFactor="2"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option type="Map" name="properties">
                       <Option type="Map" name="PositionX">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
+                        <Option type="bool" value="false" name="active"/>
+                        <Option type="int" value="1" name="type"/>
+                        <Option type="QString" value="" name="val"/>
                       </Option>
                       <Option type="Map" name="PositionY">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
+                        <Option type="bool" value="false" name="active"/>
+                        <Option type="int" value="1" name="type"/>
+                        <Option type="QString" value="" name="val"/>
                       </Option>
                       <Option type="Map" name="PredefinedPositionOrder">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="quadrant" type="QString" name="field"/>
-                        <Option value="2" type="int" name="type"/>
+                        <Option type="bool" value="true" name="active"/>
+                        <Option type="QString" value="quadrant" name="field"/>
+                        <Option type="int" value="2" name="type"/>
                       </Option>
                       <Option type="Map" name="Rotation">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="rotation" type="QString" name="field"/>
-                        <Option value="2" type="int" name="type"/>
+                        <Option type="bool" value="false" name="active"/>
+                        <Option type="QString" value="rotation" name="field"/>
+                        <Option type="int" value="2" name="type"/>
                       </Option>
                     </Option>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </dd_properties>
                 <callout type="simple">
                   <Option type="Map">
-                    <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                    <Option value="0" type="int" name="blendMode"/>
+                    <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+                    <Option type="int" value="0" name="blendMode"/>
                     <Option type="Map" name="ddProperties">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
-                    <Option value="false" type="bool" name="drawToAllParts"/>
-                    <Option value="0" type="QString" name="enabled"/>
-                    <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                    <Option value="&lt;symbol is_animated=&quot;0&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                    <Option value="0" type="double" name="minLength"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                    <Option value="MM" type="QString" name="minLengthUnit"/>
-                    <Option value="0" type="double" name="offsetFromAnchor"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                    <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                    <Option value="0" type="double" name="offsetFromLabel"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                    <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                    <Option type="bool" value="false" name="drawToAllParts"/>
+                    <Option type="QString" value="0" name="enabled"/>
+                    <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
+                    <Option type="QString" value="&lt;symbol alpha=&quot;1&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
+                    <Option type="double" value="0" name="minLength"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
+                    <Option type="QString" value="MM" name="minLengthUnit"/>
+                    <Option type="double" value="0" name="offsetFromAnchor"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
+                    <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
+                    <Option type="double" value="0" name="offsetFromLabel"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
+                    <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
                   </Option>
                 </callout>
               </settings>
             </rule>
-            <rule active="0" filter="&quot;Source&quot; = 'Trail'" description="Trail" key="{a7469442-5b53-4ac3-b1ce-1af4427c496f}">
+            <rule description="Trail" active="0" key="{d4116bb5-e30d-46f8-be72-731e74a92758}" filter="&quot;Source&quot; = 'Trail'">
               <settings calloutType="simple">
-                <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="63" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="255,255,255,255" textOpacity="1" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" useSubstitutions="0" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="10" namedStyle="Semibold" forcedItalic="0" isExpression="1" fontSizeUnit="Point" allowHtml="0" legendString="Aa">
+                <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="Semibold" fontUnderline="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" useSubstitutions="0" fontWeight="63" fontStrikeout="0" fontItalic="0" fontSize="10" allowHtml="0" fontKerning="1" textColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" isExpression="1" legendString="Aa" textOrientation="horizontal">
                   <families/>
-                  <text-buffer bufferNoFill="0" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                  <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="0"/>
-                  <background shapeRadiiY="1" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="145,211,55,255" shapeDraw="1" shapeBorderWidth="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="1" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="145,211,55,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="1" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-                    <symbol is_animated="0" type="marker" name="markerSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+                  <text-buffer bufferNoFill="0" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+                  <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskType="0"/>
+                  <background shapeRadiiY="1" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="145,211,55,255" shapeRotationType="0" shapeSizeX="1" shapeDraw="1" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="145,211,55,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="1">
+                    <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="markerSymbol">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
-                      <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                      <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
                         <Option type="Map">
-                          <Option value="0" type="QString" name="angle"/>
-                          <Option value="square" type="QString" name="cap_style"/>
-                          <Option value="133,182,111,255" type="QString" name="color"/>
-                          <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                          <Option value="bevel" type="QString" name="joinstyle"/>
-                          <Option value="circle" type="QString" name="name"/>
-                          <Option value="0,0" type="QString" name="offset"/>
-                          <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                          <Option value="MM" type="QString" name="offset_unit"/>
-                          <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                          <Option value="solid" type="QString" name="outline_style"/>
-                          <Option value="0" type="QString" name="outline_width"/>
-                          <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                          <Option value="MM" type="QString" name="outline_width_unit"/>
-                          <Option value="diameter" type="QString" name="scale_method"/>
-                          <Option value="2" type="QString" name="size"/>
-                          <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                          <Option value="MM" type="QString" name="size_unit"/>
-                          <Option value="1" type="QString" name="vertical_anchor_point"/>
+                          <Option type="QString" value="0" name="angle"/>
+                          <Option type="QString" value="square" name="cap_style"/>
+                          <Option type="QString" value="133,182,111,255" name="color"/>
+                          <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                          <Option type="QString" value="bevel" name="joinstyle"/>
+                          <Option type="QString" value="circle" name="name"/>
+                          <Option type="QString" value="0,0" name="offset"/>
+                          <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                          <Option type="QString" value="MM" name="offset_unit"/>
+                          <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                          <Option type="QString" value="solid" name="outline_style"/>
+                          <Option type="QString" value="0" name="outline_width"/>
+                          <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                          <Option type="QString" value="MM" name="outline_width_unit"/>
+                          <Option type="QString" value="diameter" name="scale_method"/>
+                          <Option type="QString" value="2" name="size"/>
+                          <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                          <Option type="QString" value="MM" name="size_unit"/>
+                          <Option type="QString" value="1" name="vertical_anchor_point"/>
                         </Option>
                         <prop k="angle" v="0"/>
                         <prop k="cap_style" v="square"/>
@@ -23264,34 +23283,34 @@ def my_form_open(dialog, layer, feature):
                         <prop k="vertical_anchor_point" v="1"/>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option value="" type="QString" name="name"/>
+                            <Option type="QString" value="" name="name"/>
                             <Option name="properties"/>
-                            <Option value="collection" type="QString" name="type"/>
+                            <Option type="QString" value="collection" name="type"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
-                    <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+                    <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
-                      <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                      <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                         <Option type="Map">
-                          <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                          <Option value="0,72,255,255" type="QString" name="color"/>
-                          <Option value="round" type="QString" name="joinstyle"/>
-                          <Option value="0,0" type="QString" name="offset"/>
-                          <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                          <Option value="MM" type="QString" name="offset_unit"/>
-                          <Option value="0,72,255,255" type="QString" name="outline_color"/>
-                          <Option value="solid" type="QString" name="outline_style"/>
-                          <Option value="1" type="QString" name="outline_width"/>
-                          <Option value="MM" type="QString" name="outline_width_unit"/>
-                          <Option value="solid" type="QString" name="style"/>
+                          <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                          <Option type="QString" value="0,72,255,255" name="color"/>
+                          <Option type="QString" value="round" name="joinstyle"/>
+                          <Option type="QString" value="0,0" name="offset"/>
+                          <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                          <Option type="QString" value="MM" name="offset_unit"/>
+                          <Option type="QString" value="0,72,255,255" name="outline_color"/>
+                          <Option type="QString" value="solid" name="outline_style"/>
+                          <Option type="QString" value="1" name="outline_width"/>
+                          <Option type="QString" value="MM" name="outline_width_unit"/>
+                          <Option type="QString" value="solid" name="style"/>
                         </Option>
                         <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                         <prop k="color" v="0,72,255,255"/>
@@ -23306,77 +23325,77 @@ def my_form_open(dialog, layer, feature):
                         <prop k="style" v="solid"/>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option value="" type="QString" name="name"/>
+                            <Option type="QString" value="" name="name"/>
                             <Option name="properties"/>
-                            <Option value="collection" type="QString" name="type"/>
+                            <Option type="QString" value="collection" name="type"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+                  <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
                   <dd_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format useMaxLineLengthForAutoWrap="1" leftDirectionSymbol="&lt;" wrapChar="" multilineAlign="3" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" decimals="0" rightDirectionSymbol=">" formatNumbers="0"/>
-                <placement overlapHandling="AllowOverlapIfRequired" lineAnchorType="0" centroidInside="0" overrunDistance="0" centroidWhole="0" geometryGeneratorEnabled="0" rotationAngle="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" geometryGeneratorType="PointGeometry" quadOffset="4" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="6" xOffset="0" allowDegraded="1" lineAnchorTextPoint="CenterOfText" layerType="PointGeometry" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" maxCurvedCharAngleOut="-20" repeatDistance="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" dist="2" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" distUnits="MM" lineAnchorClipping="0" placementFlags="10" priority="10" overrunDistanceUnit="MM" maxCurvedCharAngleIn="20" geometryGenerator="" lineAnchorPercent="0.5" yOffset="0" rotationUnit="AngleDegrees"/>
-                <rendering fontMaxPixelSize="10000" drawLabels="1" mergeLines="0" zIndex="0" upsidedownLabels="0" obstacleFactor="2" scaleVisibility="0" limitNumLabels="0" obstacleType="0" fontLimitPixelSize="0" maxNumLabels="2000" minFeatureSize="0" fontMinPixelSize="3" labelPerPart="0" obstacle="1" scaleMax="10000000" scaleMin="1" unplacedVisibility="0"/>
+                <text-format wrapChar="" rightDirectionSymbol=">" plussign="0" leftDirectionSymbol="&lt;" formatNumbers="0" decimals="0" multilineAlign="3" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
+                <placement offsetUnits="MapUnit" xOffset="0" maxCurvedCharAngleOut="-20" layerType="PointGeometry" allowDegraded="1" yOffset="0" overlapHandling="AllowOverlapIfRequired" geometryGeneratorType="PointGeometry" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" repeatDistanceUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" quadOffset="4" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidWhole="0" overrunDistance="0" overrunDistanceUnit="MM" centroidInside="0" placement="6" geometryGenerator="" priority="10" distUnits="MM" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" dist="2" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorTextPoint="CenterOfText" polygonPlacementFlags="2" rotationUnit="AngleDegrees" offsetType="0" placementFlags="10" repeatDistance="0"/>
+                <rendering limitNumLabels="0" obstacleType="0" obstacle="1" scaleMax="10000000" maxNumLabels="2000" labelPerPart="0" scaleMin="1" upsidedownLabels="0" zIndex="0" unplacedVisibility="0" fontLimitPixelSize="0" minFeatureSize="0" fontMaxPixelSize="10000" scaleVisibility="0" fontMinPixelSize="3" drawLabels="1" mergeLines="0" obstacleFactor="2"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option type="Map" name="properties">
                       <Option type="Map" name="PositionX">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
+                        <Option type="bool" value="false" name="active"/>
+                        <Option type="int" value="1" name="type"/>
+                        <Option type="QString" value="" name="val"/>
                       </Option>
                       <Option type="Map" name="PositionY">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
+                        <Option type="bool" value="false" name="active"/>
+                        <Option type="int" value="1" name="type"/>
+                        <Option type="QString" value="" name="val"/>
                       </Option>
                       <Option type="Map" name="PredefinedPositionOrder">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="quadrant" type="QString" name="field"/>
-                        <Option value="2" type="int" name="type"/>
+                        <Option type="bool" value="true" name="active"/>
+                        <Option type="QString" value="quadrant" name="field"/>
+                        <Option type="int" value="2" name="type"/>
                       </Option>
                       <Option type="Map" name="Rotation">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="rotation" type="QString" name="field"/>
-                        <Option value="2" type="int" name="type"/>
+                        <Option type="bool" value="false" name="active"/>
+                        <Option type="QString" value="rotation" name="field"/>
+                        <Option type="int" value="2" name="type"/>
                       </Option>
                     </Option>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </dd_properties>
                 <callout type="simple">
                   <Option type="Map">
-                    <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                    <Option value="0" type="int" name="blendMode"/>
+                    <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+                    <Option type="int" value="0" name="blendMode"/>
                     <Option type="Map" name="ddProperties">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
-                    <Option value="false" type="bool" name="drawToAllParts"/>
-                    <Option value="0" type="QString" name="enabled"/>
-                    <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                    <Option value="&lt;symbol is_animated=&quot;0&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                    <Option value="0" type="double" name="minLength"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                    <Option value="MM" type="QString" name="minLengthUnit"/>
-                    <Option value="0" type="double" name="offsetFromAnchor"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                    <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                    <Option value="0" type="double" name="offsetFromLabel"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                    <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                    <Option type="bool" value="false" name="drawToAllParts"/>
+                    <Option type="QString" value="0" name="enabled"/>
+                    <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
+                    <Option type="QString" value="&lt;symbol alpha=&quot;1&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
+                    <Option type="double" value="0" name="minLength"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
+                    <Option type="QString" value="MM" name="minLengthUnit"/>
+                    <Option type="double" value="0" name="offsetFromAnchor"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
+                    <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
+                    <Option type="double" value="0" name="offsetFromLabel"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
+                    <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
                   </Option>
                 </callout>
               </settings>
@@ -23386,13 +23405,13 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="no_action" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="no_action" name="QFieldSync/action"/>
+          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
           <Option type="List" name="dualview/previewExpressions">
-            <Option value="COALESCE(&quot;Text&quot;, '&lt;NULL>')" type="QString"/>
+            <Option type="QString" value="COALESCE(&quot;Text&quot;, '&lt;NULL>')"/>
           </Option>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="QString" value="0" name="embeddedWidgets/count"/>
           <Option type="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -23400,48 +23419,48 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory penAlpha="255" width="15" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" minimumSize="0" enabled="0" maxScaleDenominator="1e+08" diagramOrientation="Up" opacity="1" scaleBasedVisibility="0" spacingUnit="MM" minScaleDenominator="100000" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" lineSizeType="MM" penWidth="0" backgroundAlpha="255" scaleDependency="Area" spacing="0" direction="1" barWidth="5" sizeType="MM" height="15" penColor="#000000" showAxis="0">
-          <fontProperties bold="0" style="" italic="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0"/>
-          <attribute label="" colorOpacity="1" field="" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory height="15" scaleDependency="Area" width="15" lineSizeScale="3x:0,0,0,0,0,0" spacingUnit="MM" lineSizeType="MM" penColor="#000000" spacing="0" labelPlacementMethod="XHeight" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" backgroundAlpha="255" maxScaleDenominator="1e+08" barWidth="5" penWidth="0" minimumSize="0" penAlpha="255" minScaleDenominator="100000" sizeType="MM" backgroundColor="#ffffff" enabled="0" opacity="1" direction="1" scaleBasedVisibility="0" showAxis="0" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270">
+          <fontProperties style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0" strikethrough="0" italic="0" underline="0" bold="0"/>
+          <attribute color="#000000" field="" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="35,35,35,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0.26" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -23472,9 +23491,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -23482,28 +23501,28 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="2" showAll="1" placement="0" zIndex="0" dist="0" priority="0" obstacle="0">
+      <DiagramLayerSettings priority="0" linePlacementFlags="2" obstacle="0" dist="0" zIndex="0" placement="0" showAll="1">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field configurationFlags="None" name="Name">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -23512,8 +23531,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -23522,8 +23541,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -23532,8 +23551,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -23542,8 +23561,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -23552,8 +23571,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -23562,8 +23581,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -23572,8 +23591,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -23596,8 +23615,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -23606,8 +23625,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -23616,8 +23635,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -23626,8 +23645,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -23641,95 +23660,95 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="Name"/>
-        <alias index="1" name="" field="descriptio"/>
-        <alias index="2" name="" field="timestamp"/>
-        <alias index="3" name="" field="begin"/>
-        <alias index="4" name="" field="end"/>
-        <alias index="5" name="" field="Distance"/>
-        <alias index="6" name="" field="RouteLen"/>
-        <alias index="7" name="" field="Source"/>
-        <alias index="8" name="" field="Sort"/>
-        <alias index="9" name="" field="day"/>
-        <alias index="10" name="" field="length_km"/>
-        <alias index="11" name="" field="length_m"/>
-        <alias index="12" name="" field="org_fid"/>
-        <alias index="13" name="" field="distance"/>
-        <alias index="14" name="" field="quadrant"/>
+        <alias index="0" field="Name" name=""/>
+        <alias index="1" field="descriptio" name=""/>
+        <alias index="2" field="timestamp" name=""/>
+        <alias index="3" field="begin" name=""/>
+        <alias index="4" field="end" name=""/>
+        <alias index="5" field="Distance" name=""/>
+        <alias index="6" field="RouteLen" name=""/>
+        <alias index="7" field="Source" name=""/>
+        <alias index="8" field="Sort" name=""/>
+        <alias index="9" field="day" name=""/>
+        <alias index="10" field="length_km" name=""/>
+        <alias index="11" field="length_m" name=""/>
+        <alias index="12" field="org_fid" name=""/>
+        <alias index="13" field="distance" name=""/>
+        <alias index="14" field="quadrant" name=""/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="Name"/>
-        <default applyOnUpdate="0" expression="" field="descriptio"/>
-        <default applyOnUpdate="0" expression="" field="timestamp"/>
-        <default applyOnUpdate="0" expression="" field="begin"/>
-        <default applyOnUpdate="0" expression="" field="end"/>
-        <default applyOnUpdate="0" expression="" field="Distance"/>
-        <default applyOnUpdate="0" expression="" field="RouteLen"/>
-        <default applyOnUpdate="0" expression="" field="Source"/>
-        <default applyOnUpdate="0" expression="" field="Sort"/>
-        <default applyOnUpdate="0" expression="" field="day"/>
-        <default applyOnUpdate="0" expression="" field="length_km"/>
-        <default applyOnUpdate="0" expression="" field="length_m"/>
-        <default applyOnUpdate="0" expression="" field="org_fid"/>
-        <default applyOnUpdate="0" expression="" field="distance"/>
-        <default applyOnUpdate="0" expression="" field="quadrant"/>
+        <default applyOnUpdate="0" field="Name" expression=""/>
+        <default applyOnUpdate="0" field="descriptio" expression=""/>
+        <default applyOnUpdate="0" field="timestamp" expression=""/>
+        <default applyOnUpdate="0" field="begin" expression=""/>
+        <default applyOnUpdate="0" field="end" expression=""/>
+        <default applyOnUpdate="0" field="Distance" expression=""/>
+        <default applyOnUpdate="0" field="RouteLen" expression=""/>
+        <default applyOnUpdate="0" field="Source" expression=""/>
+        <default applyOnUpdate="0" field="Sort" expression=""/>
+        <default applyOnUpdate="0" field="day" expression=""/>
+        <default applyOnUpdate="0" field="length_km" expression=""/>
+        <default applyOnUpdate="0" field="length_m" expression=""/>
+        <default applyOnUpdate="0" field="org_fid" expression=""/>
+        <default applyOnUpdate="0" field="distance" expression=""/>
+        <default applyOnUpdate="0" field="quadrant" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="Name" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="descriptio" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="timestamp" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="begin" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="end" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="Distance" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="RouteLen" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="Source" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="Sort" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="day" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="length_km" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="length_m" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="org_fid" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="distance" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="quadrant" constraints="0"/>
+        <constraint exp_strength="0" field="Name" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="descriptio" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="timestamp" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="begin" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="end" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="Distance" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="RouteLen" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="Source" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="Sort" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="day" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="length_km" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="length_m" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="org_fid" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="distance" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="quadrant" notnull_strength="0" constraints="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" desc="" field="Name"/>
-        <constraint exp="" desc="" field="descriptio"/>
-        <constraint exp="" desc="" field="timestamp"/>
-        <constraint exp="" desc="" field="begin"/>
-        <constraint exp="" desc="" field="end"/>
-        <constraint exp="" desc="" field="Distance"/>
-        <constraint exp="" desc="" field="RouteLen"/>
-        <constraint exp="" desc="" field="Source"/>
-        <constraint exp="" desc="" field="Sort"/>
-        <constraint exp="" desc="" field="day"/>
-        <constraint exp="" desc="" field="length_km"/>
-        <constraint exp="" desc="" field="length_m"/>
-        <constraint exp="" desc="" field="org_fid"/>
-        <constraint exp="" desc="" field="distance"/>
-        <constraint exp="" desc="" field="quadrant"/>
+        <constraint exp="" field="Name" desc=""/>
+        <constraint exp="" field="descriptio" desc=""/>
+        <constraint exp="" field="timestamp" desc=""/>
+        <constraint exp="" field="begin" desc=""/>
+        <constraint exp="" field="end" desc=""/>
+        <constraint exp="" field="Distance" desc=""/>
+        <constraint exp="" field="RouteLen" desc=""/>
+        <constraint exp="" field="Source" desc=""/>
+        <constraint exp="" field="Sort" desc=""/>
+        <constraint exp="" field="day" desc=""/>
+        <constraint exp="" field="length_km" desc=""/>
+        <constraint exp="" field="length_m" desc=""/>
+        <constraint exp="" field="org_fid" desc=""/>
+        <constraint exp="" field="distance" desc=""/>
+        <constraint exp="" field="quadrant" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="&quot;Distance&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="&quot;Distance&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
           <column width="-1" type="actions" hidden="1"/>
-          <column width="-1" type="field" name="org_fid" hidden="0"/>
-          <column width="-1" type="field" name="distance" hidden="0"/>
-          <column width="-1" type="field" name="Name" hidden="0"/>
-          <column width="-1" type="field" name="Source" hidden="0"/>
-          <column width="-1" type="field" name="RouteLen" hidden="0"/>
-          <column width="-1" type="field" name="descriptio" hidden="0"/>
-          <column width="-1" type="field" name="timestamp" hidden="0"/>
-          <column width="-1" type="field" name="begin" hidden="0"/>
-          <column width="-1" type="field" name="end" hidden="0"/>
-          <column width="-1" type="field" name="Distance" hidden="0"/>
-          <column width="-1" type="field" name="length_km" hidden="0"/>
-          <column width="-1" type="field" name="Sort" hidden="0"/>
-          <column width="-1" type="field" name="quadrant" hidden="0"/>
-          <column width="-1" type="field" name="day" hidden="0"/>
-          <column width="-1" type="field" name="length_m" hidden="0"/>
+          <column width="-1" type="field" hidden="0" name="org_fid"/>
+          <column width="-1" type="field" hidden="0" name="distance"/>
+          <column width="-1" type="field" hidden="0" name="Name"/>
+          <column width="-1" type="field" hidden="0" name="Source"/>
+          <column width="-1" type="field" hidden="0" name="RouteLen"/>
+          <column width="-1" type="field" hidden="0" name="descriptio"/>
+          <column width="-1" type="field" hidden="0" name="timestamp"/>
+          <column width="-1" type="field" hidden="0" name="begin"/>
+          <column width="-1" type="field" hidden="0" name="end"/>
+          <column width="-1" type="field" hidden="0" name="Distance"/>
+          <column width="-1" type="field" hidden="0" name="length_km"/>
+          <column width="-1" type="field" hidden="0" name="Sort"/>
+          <column width="-1" type="field" hidden="0" name="quadrant"/>
+          <column width="-1" type="field" hidden="0" name="day"/>
+          <column width="-1" type="field" hidden="0" name="length_m"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -23761,62 +23780,62 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="Distance" editable="1"/>
-        <field name="Name" editable="1"/>
-        <field name="RouteLen" editable="1"/>
-        <field name="Sort" editable="1"/>
-        <field name="Source" editable="1"/>
-        <field name="begin" editable="1"/>
-        <field name="day" editable="1"/>
-        <field name="descriptio" editable="1"/>
-        <field name="distance" editable="1"/>
-        <field name="end" editable="1"/>
-        <field name="length_km" editable="1"/>
-        <field name="length_m" editable="1"/>
-        <field name="org_fid" editable="1"/>
-        <field name="quadrant" editable="1"/>
-        <field name="timestamp" editable="1"/>
+        <field editable="1" name="Distance"/>
+        <field editable="1" name="Name"/>
+        <field editable="1" name="RouteLen"/>
+        <field editable="1" name="Sort"/>
+        <field editable="1" name="Source"/>
+        <field editable="1" name="begin"/>
+        <field editable="1" name="day"/>
+        <field editable="1" name="descriptio"/>
+        <field editable="1" name="distance"/>
+        <field editable="1" name="end"/>
+        <field editable="1" name="length_km"/>
+        <field editable="1" name="length_m"/>
+        <field editable="1" name="org_fid"/>
+        <field editable="1" name="quadrant"/>
+        <field editable="1" name="timestamp"/>
       </editable>
       <labelOnTop>
-        <field name="Distance" labelOnTop="0"/>
-        <field name="Name" labelOnTop="0"/>
-        <field name="RouteLen" labelOnTop="0"/>
-        <field name="Sort" labelOnTop="0"/>
-        <field name="Source" labelOnTop="0"/>
-        <field name="begin" labelOnTop="0"/>
-        <field name="day" labelOnTop="0"/>
-        <field name="descriptio" labelOnTop="0"/>
-        <field name="distance" labelOnTop="0"/>
-        <field name="end" labelOnTop="0"/>
-        <field name="length_km" labelOnTop="0"/>
-        <field name="length_m" labelOnTop="0"/>
-        <field name="org_fid" labelOnTop="0"/>
-        <field name="quadrant" labelOnTop="0"/>
-        <field name="timestamp" labelOnTop="0"/>
+        <field labelOnTop="0" name="Distance"/>
+        <field labelOnTop="0" name="Name"/>
+        <field labelOnTop="0" name="RouteLen"/>
+        <field labelOnTop="0" name="Sort"/>
+        <field labelOnTop="0" name="Source"/>
+        <field labelOnTop="0" name="begin"/>
+        <field labelOnTop="0" name="day"/>
+        <field labelOnTop="0" name="descriptio"/>
+        <field labelOnTop="0" name="distance"/>
+        <field labelOnTop="0" name="end"/>
+        <field labelOnTop="0" name="length_km"/>
+        <field labelOnTop="0" name="length_m"/>
+        <field labelOnTop="0" name="org_fid"/>
+        <field labelOnTop="0" name="quadrant"/>
+        <field labelOnTop="0" name="timestamp"/>
       </labelOnTop>
       <reuseLastValue>
-        <field name="Distance" reuseLastValue="0"/>
-        <field name="Name" reuseLastValue="0"/>
-        <field name="RouteLen" reuseLastValue="0"/>
-        <field name="Sort" reuseLastValue="0"/>
-        <field name="Source" reuseLastValue="0"/>
-        <field name="begin" reuseLastValue="0"/>
-        <field name="day" reuseLastValue="0"/>
-        <field name="descriptio" reuseLastValue="0"/>
-        <field name="distance" reuseLastValue="0"/>
-        <field name="end" reuseLastValue="0"/>
-        <field name="length_km" reuseLastValue="0"/>
-        <field name="length_m" reuseLastValue="0"/>
-        <field name="org_fid" reuseLastValue="0"/>
-        <field name="quadrant" reuseLastValue="0"/>
-        <field name="timestamp" reuseLastValue="0"/>
+        <field reuseLastValue="0" name="Distance"/>
+        <field reuseLastValue="0" name="Name"/>
+        <field reuseLastValue="0" name="RouteLen"/>
+        <field reuseLastValue="0" name="Sort"/>
+        <field reuseLastValue="0" name="Source"/>
+        <field reuseLastValue="0" name="begin"/>
+        <field reuseLastValue="0" name="day"/>
+        <field reuseLastValue="0" name="descriptio"/>
+        <field reuseLastValue="0" name="distance"/>
+        <field reuseLastValue="0" name="end"/>
+        <field reuseLastValue="0" name="length_km"/>
+        <field reuseLastValue="0" name="length_m"/>
+        <field reuseLastValue="0" name="org_fid"/>
+        <field reuseLastValue="0" name="quadrant"/>
+        <field reuseLastValue="0" name="timestamp"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>COALESCE("Text", '&lt;NULL>')</previewExpression>
       <mapTip>Text</mapTip>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" simplifyLocal="1" autoRefreshTime="0" wkbType="MultiPolygon" simplifyDrawingHints="1" type="vector" symbologyReferenceScale="-1" minScale="100000000" legendPlaceholderImage="" refreshOnNotifyEnabled="0" labelsEnabled="0" maxScale="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" refreshOnNotifyMessage="" readOnly="0" geometry="Polygon" autoRefreshEnabled="0" simplifyDrawingTol="1">
+    <maplayer simplifyLocal="1" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1" legendPlaceholderImage="" symbologyReferenceScale="-1" readOnly="0" refreshOnNotifyEnabled="0" minScale="100000000" maxScale="0" type="vector" autoRefreshTime="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="0" styleCategories="AllStyleCategories" geometry="Polygon" autoRefreshEnabled="0" wkbType="MultiPolygon">
       <extent>
         <xmin>18.40435736428151614</xmin>
         <ymin>-33.90613600950420903</ymin>
@@ -23889,58 +23908,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" startExpression="" mode="0" limitMode="0" endField="" fixedDuration="0" accumulate="0" durationUnit="min" startField="" endExpression="" enabled="0">
+      <temporal durationField="" fixedDuration="0" accumulate="0" endField="" startField="" enabled="0" startExpression="" endExpression="" durationUnit="min" mode="0" limitMode="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" zscale="1" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" binding="Centroid" type="IndividualFeatures" symbology="Line" extrusion="0" zoffset="0">
+      <elevation extrusionEnabled="0" symbology="Line" type="IndividualFeatures" zscale="1" clamping="Terrain" showMarkerSymbolInSurfacePlots="0" zoffset="0" extrusion="0" respectLayerSymbol="1" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="229,182,54,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="229,182,54,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -23971,36 +23990,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="229,182,54,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="164,130,39,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="229,182,54,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="164,130,39,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="229,182,54,255"/>
@@ -24015,44 +24034,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="229,182,54,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="164,130,39,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="229,182,54,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="diamond" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="164,130,39,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="3" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -24075,38 +24094,38 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" type="singleSymbol" symbollevels="0" referencescale="-1" enableorderby="0">
+      <renderer-v2 enableorderby="0" type="singleSymbol" symbollevels="0" referencescale="-1" forceraster="0">
         <symbols>
-          <symbol is_animated="0" type="fill" name="0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="114,155,111,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="114,155,111,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.26" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="114,155,111,255"/>
@@ -24121,9 +24140,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -24134,22 +24153,22 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option value="&quot;id&quot;" type="QString" name="dualview/previewExpressions"/>
+          <Option type="QString" value="copy" name="QFieldSync/action"/>
+          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="&quot;id&quot;" name="dualview/previewExpressions"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks type="StringList">
-          <Option value="" type="QString"/>
+          <Option type="QString" value=""/>
         </activeChecks>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field configurationFlags="None" name="id">
@@ -24175,34 +24194,34 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
-        <alias index="1" name="" field="area"/>
-        <alias index="2" name="" field="rotation"/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="area" name=""/>
+        <alias index="2" field="rotation" name=""/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="area"/>
-        <default applyOnUpdate="0" expression="" field="rotation"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="area" expression=""/>
+        <default applyOnUpdate="0" field="rotation" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="id" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="area" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="rotation" constraints="0"/>
+        <constraint exp_strength="0" field="id" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="area" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="rotation" notnull_strength="0" constraints="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" desc="" field="id"/>
-        <constraint exp="" desc="" field="area"/>
-        <constraint exp="" desc="" field="rotation"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="area" desc=""/>
+        <constraint exp="" field="rotation" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="&quot;rotation&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="&quot;rotation&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column width="-1" type="field" name="id" hidden="0"/>
-          <column width="-1" type="field" name="area" hidden="0"/>
-          <column width="-1" type="field" name="rotation" hidden="0"/>
+          <column width="-1" type="field" hidden="0" name="id"/>
+          <column width="-1" type="field" hidden="0" name="area"/>
+          <column width="-1" type="field" hidden="0" name="rotation"/>
           <column width="-1" type="actions" hidden="1"/>
         </columns>
       </attributetableconfig>
@@ -24226,7 +24245,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>"id"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" simplifyLocal="1" autoRefreshTime="0" wkbType="Point" simplifyDrawingHints="0" type="vector" symbologyReferenceScale="-1" minScale="100000000" legendPlaceholderImage="" refreshOnNotifyEnabled="0" labelsEnabled="0" maxScale="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" refreshOnNotifyMessage="" readOnly="0" geometry="Point" autoRefreshEnabled="0" simplifyDrawingTol="1">
+    <maplayer simplifyLocal="1" simplifyDrawingHints="0" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1" legendPlaceholderImage="" symbologyReferenceScale="-1" readOnly="0" refreshOnNotifyEnabled="0" minScale="100000000" maxScale="0" type="vector" autoRefreshTime="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="0" styleCategories="AllStyleCategories" geometry="Point" autoRefreshEnabled="0" wkbType="Point">
       <extent>
         <xmin>18.38475260238231712</xmin>
         <ymin>-33.92228210414224776</ymin>
@@ -24291,7 +24310,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxy="0" minz="0" dimensions="2" maxx="0" maxz="0" miny="0" minx="0" crs=""/>
+          <spatial maxz="0" minx="0" maxx="0" minz="0" crs="" miny="0" maxy="0" dimensions="2"/>
           <temporal>
             <period>
               <start></start>
@@ -24316,58 +24335,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" startExpression="" mode="0" limitMode="0" endField="" fixedDuration="0" accumulate="0" durationUnit="min" startField="" endExpression="" enabled="0">
+      <temporal durationField="" fixedDuration="0" accumulate="0" endField="" startField="" enabled="0" startExpression="" endExpression="" durationUnit="min" mode="0" limitMode="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" zscale="1" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" binding="Centroid" type="IndividualFeatures" symbology="Line" extrusion="0" zoffset="0">
+      <elevation extrusionEnabled="0" symbology="Line" type="IndividualFeatures" zscale="1" clamping="Terrain" showMarkerSymbolInSurfacePlots="0" zoffset="0" extrusion="0" respectLayerSymbol="1" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="196,60,57,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="196,60,57,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -24398,36 +24417,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="196,60,57,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="140,43,41,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="196,60,57,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="140,43,41,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="196,60,57,255"/>
@@ -24442,44 +24461,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="196,60,57,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="140,43,41,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="196,60,57,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="diamond" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="140,43,41,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="3" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -24502,49 +24521,49 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" type="RuleRenderer" symbollevels="0" referencescale="-1" enableorderby="0">
+      <renderer-v2 enableorderby="0" type="RuleRenderer" symbollevels="0" referencescale="-1" forceraster="0">
         <rules key="{01115dc1-cc6e-4980-a968-7ef94a3b9df6}">
-          <rule symbol="0" label="All distances" checkstate="0" key="{e9652330-031e-4b93-b5b4-4caae12a21f9}"/>
+          <rule symbol="0" label="All distances" key="{e9652330-031e-4b93-b5b4-4caae12a21f9}" checkstate="0"/>
         </rules>
         <symbols>
-          <symbol is_animated="0" type="marker" name="0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="1" pass="0" class="SimpleMarker" enabled="1">
+            <layer locked="1" class="SimpleMarker" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="0,0,0,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="circle" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,0" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="0.5" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="0,0,0,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="circle" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="35,35,35,0" name="outline_color"/>
+                <Option type="QString" value="no" name="outline_style"/>
+                <Option type="QString" value="0" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="0.5" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -24567,20 +24586,20 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="fillColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="size">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -24592,15 +24611,15 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="copy" name="QFieldSync/action"/>
+          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
           <Option type="StringList" name="dualview/previewExpressions">
-            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
           </Option>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="QString" value="0" name="embeddedWidgets/count"/>
           <Option type="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -24608,48 +24627,48 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory penAlpha="255" width="15" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" minimumSize="0" enabled="0" maxScaleDenominator="1e+08" diagramOrientation="Up" opacity="1" scaleBasedVisibility="0" spacingUnit="MM" minScaleDenominator="0" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" lineSizeType="MM" penWidth="0" backgroundAlpha="255" scaleDependency="Area" spacing="0" direction="1" barWidth="5" sizeType="MM" height="15" penColor="#000000" showAxis="0">
-          <fontProperties bold="0" style="" italic="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0"/>
-          <attribute label="" colorOpacity="1" field="" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory height="15" scaleDependency="Area" width="15" lineSizeScale="3x:0,0,0,0,0,0" spacingUnit="MM" lineSizeType="MM" penColor="#000000" spacing="0" labelPlacementMethod="XHeight" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" backgroundAlpha="255" maxScaleDenominator="1e+08" barWidth="5" penWidth="0" minimumSize="0" penAlpha="255" minScaleDenominator="0" sizeType="MM" backgroundColor="#ffffff" enabled="0" opacity="1" direction="1" scaleBasedVisibility="0" showAxis="0" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270">
+          <fontProperties style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0" strikethrough="0" italic="0" underline="0" bold="0"/>
+          <attribute color="#000000" field="" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="35,35,35,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0.26" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -24680,9 +24699,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -24690,20 +24709,20 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" showAll="1" placement="0" zIndex="0" dist="0" priority="0" obstacle="0">
+      <DiagramLayerSettings priority="0" linePlacementFlags="18" obstacle="0" dist="0" zIndex="0" placement="0" showAll="1">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field configurationFlags="None" name="Name">
@@ -24731,8 +24750,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -24748,8 +24767,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -24758,8 +24777,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -24808,85 +24827,85 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="Name"/>
-        <alias index="1" name="" field="descriptio"/>
-        <alias index="2" name="" field="timestamp"/>
-        <alias index="3" name="" field="begin"/>
-        <alias index="4" name="" field="end"/>
-        <alias index="5" name="" field="RouteLen"/>
-        <alias index="6" name="" field="Source"/>
-        <alias index="7" name="" field="length_m"/>
-        <alias index="8" name="" field="length_km"/>
-        <alias index="9" name="" field="org_fid"/>
-        <alias index="10" name="" field="distance"/>
-        <alias index="11" name="" field="first_runn"/>
-        <alias index="12" name="" field="last_runne"/>
+        <alias index="0" field="Name" name=""/>
+        <alias index="1" field="descriptio" name=""/>
+        <alias index="2" field="timestamp" name=""/>
+        <alias index="3" field="begin" name=""/>
+        <alias index="4" field="end" name=""/>
+        <alias index="5" field="RouteLen" name=""/>
+        <alias index="6" field="Source" name=""/>
+        <alias index="7" field="length_m" name=""/>
+        <alias index="8" field="length_km" name=""/>
+        <alias index="9" field="org_fid" name=""/>
+        <alias index="10" field="distance" name=""/>
+        <alias index="11" field="first_runn" name=""/>
+        <alias index="12" field="last_runne" name=""/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="Name"/>
-        <default applyOnUpdate="0" expression="" field="descriptio"/>
-        <default applyOnUpdate="0" expression="" field="timestamp"/>
-        <default applyOnUpdate="0" expression="" field="begin"/>
-        <default applyOnUpdate="0" expression="" field="end"/>
-        <default applyOnUpdate="0" expression="" field="RouteLen"/>
-        <default applyOnUpdate="0" expression="" field="Source"/>
-        <default applyOnUpdate="0" expression="" field="length_m"/>
-        <default applyOnUpdate="0" expression="" field="length_km"/>
-        <default applyOnUpdate="0" expression="" field="org_fid"/>
-        <default applyOnUpdate="0" expression="" field="distance"/>
-        <default applyOnUpdate="0" expression="" field="first_runn"/>
-        <default applyOnUpdate="0" expression="" field="last_runne"/>
+        <default applyOnUpdate="0" field="Name" expression=""/>
+        <default applyOnUpdate="0" field="descriptio" expression=""/>
+        <default applyOnUpdate="0" field="timestamp" expression=""/>
+        <default applyOnUpdate="0" field="begin" expression=""/>
+        <default applyOnUpdate="0" field="end" expression=""/>
+        <default applyOnUpdate="0" field="RouteLen" expression=""/>
+        <default applyOnUpdate="0" field="Source" expression=""/>
+        <default applyOnUpdate="0" field="length_m" expression=""/>
+        <default applyOnUpdate="0" field="length_km" expression=""/>
+        <default applyOnUpdate="0" field="org_fid" expression=""/>
+        <default applyOnUpdate="0" field="distance" expression=""/>
+        <default applyOnUpdate="0" field="first_runn" expression=""/>
+        <default applyOnUpdate="0" field="last_runne" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="Name" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="descriptio" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="timestamp" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="begin" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="end" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="RouteLen" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="Source" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="length_m" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="length_km" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="org_fid" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="distance" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="first_runn" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="last_runne" constraints="0"/>
+        <constraint exp_strength="0" field="Name" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="descriptio" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="timestamp" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="begin" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="end" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="RouteLen" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="Source" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="length_m" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="length_km" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="org_fid" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="distance" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="first_runn" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="last_runne" notnull_strength="0" constraints="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" desc="" field="Name"/>
-        <constraint exp="" desc="" field="descriptio"/>
-        <constraint exp="" desc="" field="timestamp"/>
-        <constraint exp="" desc="" field="begin"/>
-        <constraint exp="" desc="" field="end"/>
-        <constraint exp="" desc="" field="RouteLen"/>
-        <constraint exp="" desc="" field="Source"/>
-        <constraint exp="" desc="" field="length_m"/>
-        <constraint exp="" desc="" field="length_km"/>
-        <constraint exp="" desc="" field="org_fid"/>
-        <constraint exp="" desc="" field="distance"/>
-        <constraint exp="" desc="" field="first_runn"/>
-        <constraint exp="" desc="" field="last_runne"/>
+        <constraint exp="" field="Name" desc=""/>
+        <constraint exp="" field="descriptio" desc=""/>
+        <constraint exp="" field="timestamp" desc=""/>
+        <constraint exp="" field="begin" desc=""/>
+        <constraint exp="" field="end" desc=""/>
+        <constraint exp="" field="RouteLen" desc=""/>
+        <constraint exp="" field="Source" desc=""/>
+        <constraint exp="" field="length_m" desc=""/>
+        <constraint exp="" field="length_km" desc=""/>
+        <constraint exp="" field="org_fid" desc=""/>
+        <constraint exp="" field="distance" desc=""/>
+        <constraint exp="" field="first_runn" desc=""/>
+        <constraint exp="" field="last_runne" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="&quot;first_runn&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="&quot;first_runn&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column width="179" type="field" name="begin" hidden="0"/>
-          <column width="-1" type="field" name="RouteLen" hidden="0"/>
-          <column width="-1" type="field" name="Source" hidden="0"/>
+          <column width="179" type="field" hidden="0" name="begin"/>
+          <column width="-1" type="field" hidden="0" name="RouteLen"/>
+          <column width="-1" type="field" hidden="0" name="Source"/>
           <column width="-1" type="actions" hidden="1"/>
-          <column width="-1" type="field" name="Name" hidden="0"/>
-          <column width="-1" type="field" name="length_m" hidden="0"/>
-          <column width="-1" type="field" name="length_km" hidden="0"/>
-          <column width="-1" type="field" name="org_fid" hidden="0"/>
-          <column width="-1" type="field" name="first_runn" hidden="0"/>
-          <column width="-1" type="field" name="last_runne" hidden="0"/>
-          <column width="-1" type="field" name="descriptio" hidden="0"/>
-          <column width="-1" type="field" name="timestamp" hidden="0"/>
-          <column width="-1" type="field" name="end" hidden="0"/>
-          <column width="-1" type="field" name="distance" hidden="0"/>
+          <column width="-1" type="field" hidden="0" name="Name"/>
+          <column width="-1" type="field" hidden="0" name="length_m"/>
+          <column width="-1" type="field" hidden="0" name="length_km"/>
+          <column width="-1" type="field" hidden="0" name="org_fid"/>
+          <column width="-1" type="field" hidden="0" name="first_runn"/>
+          <column width="-1" type="field" hidden="0" name="last_runne"/>
+          <column width="-1" type="field" hidden="0" name="descriptio"/>
+          <column width="-1" type="field" hidden="0" name="timestamp"/>
+          <column width="-1" type="field" hidden="0" name="end"/>
+          <column width="-1" type="field" hidden="0" name="distance"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -24918,58 +24937,58 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="Distance" editable="1"/>
-        <field name="Name" editable="1"/>
-        <field name="RouteLen" editable="1"/>
-        <field name="Source" editable="1"/>
-        <field name="auxiliary_storage_labeling_positionx" editable="0"/>
-        <field name="auxiliary_storage_labeling_positiony" editable="0"/>
-        <field name="begin" editable="1"/>
-        <field name="descriptio" editable="1"/>
-        <field name="display" editable="1"/>
-        <field name="distance" editable="1"/>
-        <field name="distance_1" editable="1"/>
-        <field name="end" editable="1"/>
-        <field name="first_run" editable="1"/>
-        <field name="first_runn" editable="1"/>
-        <field name="first_runner" editable="1"/>
-        <field name="first_runner_s" editable="1"/>
-        <field name="last_run" editable="0"/>
-        <field name="last_runn" editable="1"/>
-        <field name="last_runne" editable="1"/>
-        <field name="last_runner" editable="1"/>
-        <field name="last_runner_s" editable="1"/>
-        <field name="length_km" editable="1"/>
-        <field name="length_m" editable="1"/>
-        <field name="org_fid" editable="1"/>
-        <field name="timestamp" editable="1"/>
+        <field editable="1" name="Distance"/>
+        <field editable="1" name="Name"/>
+        <field editable="1" name="RouteLen"/>
+        <field editable="1" name="Source"/>
+        <field editable="0" name="auxiliary_storage_labeling_positionx"/>
+        <field editable="0" name="auxiliary_storage_labeling_positiony"/>
+        <field editable="1" name="begin"/>
+        <field editable="1" name="descriptio"/>
+        <field editable="1" name="display"/>
+        <field editable="1" name="distance"/>
+        <field editable="1" name="distance_1"/>
+        <field editable="1" name="end"/>
+        <field editable="1" name="first_run"/>
+        <field editable="1" name="first_runn"/>
+        <field editable="1" name="first_runner"/>
+        <field editable="1" name="first_runner_s"/>
+        <field editable="0" name="last_run"/>
+        <field editable="1" name="last_runn"/>
+        <field editable="1" name="last_runne"/>
+        <field editable="1" name="last_runner"/>
+        <field editable="1" name="last_runner_s"/>
+        <field editable="1" name="length_km"/>
+        <field editable="1" name="length_m"/>
+        <field editable="1" name="org_fid"/>
+        <field editable="1" name="timestamp"/>
       </editable>
       <labelOnTop>
-        <field name="Distance" labelOnTop="0"/>
-        <field name="Name" labelOnTop="0"/>
-        <field name="RouteLen" labelOnTop="0"/>
-        <field name="Source" labelOnTop="0"/>
-        <field name="auxiliary_storage_labeling_positionx" labelOnTop="0"/>
-        <field name="auxiliary_storage_labeling_positiony" labelOnTop="0"/>
-        <field name="begin" labelOnTop="0"/>
-        <field name="descriptio" labelOnTop="0"/>
-        <field name="display" labelOnTop="0"/>
-        <field name="distance" labelOnTop="0"/>
-        <field name="distance_1" labelOnTop="0"/>
-        <field name="end" labelOnTop="0"/>
-        <field name="first_run" labelOnTop="0"/>
-        <field name="first_runn" labelOnTop="0"/>
-        <field name="first_runner" labelOnTop="0"/>
-        <field name="first_runner_s" labelOnTop="0"/>
-        <field name="last_run" labelOnTop="0"/>
-        <field name="last_runn" labelOnTop="0"/>
-        <field name="last_runne" labelOnTop="0"/>
-        <field name="last_runner" labelOnTop="0"/>
-        <field name="last_runner_s" labelOnTop="0"/>
-        <field name="length_km" labelOnTop="0"/>
-        <field name="length_m" labelOnTop="0"/>
-        <field name="org_fid" labelOnTop="0"/>
-        <field name="timestamp" labelOnTop="0"/>
+        <field labelOnTop="0" name="Distance"/>
+        <field labelOnTop="0" name="Name"/>
+        <field labelOnTop="0" name="RouteLen"/>
+        <field labelOnTop="0" name="Source"/>
+        <field labelOnTop="0" name="auxiliary_storage_labeling_positionx"/>
+        <field labelOnTop="0" name="auxiliary_storage_labeling_positiony"/>
+        <field labelOnTop="0" name="begin"/>
+        <field labelOnTop="0" name="descriptio"/>
+        <field labelOnTop="0" name="display"/>
+        <field labelOnTop="0" name="distance"/>
+        <field labelOnTop="0" name="distance_1"/>
+        <field labelOnTop="0" name="end"/>
+        <field labelOnTop="0" name="first_run"/>
+        <field labelOnTop="0" name="first_runn"/>
+        <field labelOnTop="0" name="first_runner"/>
+        <field labelOnTop="0" name="first_runner_s"/>
+        <field labelOnTop="0" name="last_run"/>
+        <field labelOnTop="0" name="last_runn"/>
+        <field labelOnTop="0" name="last_runne"/>
+        <field labelOnTop="0" name="last_runner"/>
+        <field labelOnTop="0" name="last_runner_s"/>
+        <field labelOnTop="0" name="length_km"/>
+        <field labelOnTop="0" name="length_m"/>
+        <field labelOnTop="0" name="org_fid"/>
+        <field labelOnTop="0" name="timestamp"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -24977,7 +24996,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" simplifyLocal="1" autoRefreshTime="0" wkbType="MultiLineString" simplifyDrawingHints="1" type="vector" symbologyReferenceScale="-1" minScale="100000000" legendPlaceholderImage="" refreshOnNotifyEnabled="0" labelsEnabled="0" maxScale="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" refreshOnNotifyMessage="" readOnly="0" geometry="Line" autoRefreshEnabled="0" simplifyDrawingTol="1">
+    <maplayer simplifyLocal="1" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1" legendPlaceholderImage="" symbologyReferenceScale="-1" readOnly="0" refreshOnNotifyEnabled="0" minScale="100000000" maxScale="0" type="vector" autoRefreshTime="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="0" styleCategories="AllStyleCategories" geometry="Line" autoRefreshEnabled="0" wkbType="MultiLineString">
       <extent>
         <xmin>18.40189262273444371</xmin>
         <ymin>-33.90990359999999981</ymin>
@@ -25050,58 +25069,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" startExpression="" mode="0" limitMode="0" endField="" fixedDuration="0" accumulate="0" durationUnit="min" startField="" endExpression="" enabled="0">
+      <temporal durationField="" fixedDuration="0" accumulate="0" endField="" startField="" enabled="0" startExpression="" endExpression="" durationUnit="min" mode="0" limitMode="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" zscale="1" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" binding="Centroid" type="IndividualFeatures" symbology="Line" extrusion="0" zoffset="0">
+      <elevation extrusionEnabled="0" symbology="Line" type="IndividualFeatures" zscale="1" clamping="Terrain" showMarkerSymbolInSurfacePlots="0" zoffset="0" extrusion="0" respectLayerSymbol="1" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="190,178,151,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="190,178,151,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -25132,36 +25151,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="190,178,151,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="136,127,108,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="190,178,151,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="136,127,108,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="190,178,151,255"/>
@@ -25176,44 +25195,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="190,178,151,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="136,127,108,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="190,178,151,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="diamond" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="136,127,108,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="3" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -25236,58 +25255,58 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" type="RuleRenderer" symbollevels="0" referencescale="-1" enableorderby="0">
+      <renderer-v2 enableorderby="0" type="RuleRenderer" symbollevels="0" referencescale="-1" forceraster="0">
         <rules key="{5bddb61b-4527-4f61-bf00-ae5121d1f9fd}">
-          <rule filter="&quot;type&quot; IS 'car'" symbol="0" label="Car" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}"/>
-          <rule filter="&quot;type&quot; IS 'walk'" symbol="1" label="Walking" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}"/>
+          <rule symbol="0" label="Car" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}" filter="&quot;type&quot; IS 'car'"/>
+          <rule symbol="1" label="Walking" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}" filter="&quot;type&quot; IS 'walk'"/>
         </rules>
         <symbols>
-          <symbol is_animated="0" type="line" name="0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="123,211,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="1" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="123,211,0,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="1" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -25318,50 +25337,50 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" type="line" name="1" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="flat" type="QString" name="capstyle"/>
-                <Option value="4;1;1;1" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="103,34,144,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="1.25" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="1" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="flat" name="capstyle"/>
+                <Option type="QString" value="4;1;1;1" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="103,34,144,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="1.25" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="1" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="flat"/>
@@ -25392,30 +25411,30 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="LastVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="3" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="LastVertex" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -25435,33 +25454,33 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" type="marker" name="@1@1" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+              <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@1@1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer locked="0" class="FilledMarker" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="103,34,144,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="5" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="103,34,144,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="filled_arrowhead" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="5" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="103,34,144,255"/>
@@ -25477,32 +25496,32 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol is_animated="0" type="fill" name="@@1@1@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+                  <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@@1@1@0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="103,34,144,255" type="QString" name="color"/>
-                        <Option value="miter" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                        <Option value="no" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="103,34,144,255" name="color"/>
+                        <Option type="QString" value="miter" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                        <Option type="QString" value="no" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="103,34,144,255"/>
@@ -25517,9 +25536,9 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -25532,11 +25551,11 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option value="id" type="QString" name="dualview/previewExpressions"/>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="QString" value="copy" name="QFieldSync/action"/>
+          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="id" name="dualview/previewExpressions"/>
+          <Option type="QString" value="0" name="embeddedWidgets/count"/>
           <Option type="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -25544,48 +25563,48 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory penAlpha="255" width="15" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" minimumSize="0" enabled="0" maxScaleDenominator="1e+08" diagramOrientation="Up" opacity="1" scaleBasedVisibility="0" spacingUnit="MM" minScaleDenominator="0" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" lineSizeType="MM" penWidth="0" backgroundAlpha="255" scaleDependency="Area" spacing="0" direction="1" barWidth="5" sizeType="MM" height="15" penColor="#000000" showAxis="0">
-          <fontProperties bold="0" style="0" italic="1" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" strikethrough="0"/>
-          <attribute label="" colorOpacity="1" field="" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory height="15" scaleDependency="Area" width="15" lineSizeScale="3x:0,0,0,0,0,0" spacingUnit="MM" lineSizeType="MM" penColor="#000000" spacing="0" labelPlacementMethod="XHeight" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" backgroundAlpha="255" maxScaleDenominator="1e+08" barWidth="5" penWidth="0" minimumSize="0" penAlpha="255" minScaleDenominator="0" sizeType="MM" backgroundColor="#ffffff" enabled="0" opacity="1" direction="1" scaleBasedVisibility="0" showAxis="0" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270">
+          <fontProperties style="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" strikethrough="0" italic="1" underline="0" bold="0"/>
+          <attribute color="#000000" field="" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="35,35,35,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0.26" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -25616,9 +25635,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -25626,20 +25645,20 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" showAll="1" placement="2" zIndex="0" dist="0" priority="0" obstacle="0">
+      <DiagramLayerSettings priority="0" linePlacementFlags="18" obstacle="0" dist="0" zIndex="0" placement="2" showAll="1">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field configurationFlags="None" name="id">
@@ -25658,30 +25677,30 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
-        <alias index="1" name="" field="type"/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="type" name=""/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="type"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="type" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="id" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="type" constraints="0"/>
+        <constraint exp_strength="0" field="id" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="type" notnull_strength="0" constraints="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" desc="" field="id"/>
-        <constraint exp="" desc="" field="type"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="type" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column width="-1" type="field" name="id" hidden="0"/>
+          <column width="-1" type="field" hidden="0" name="id"/>
           <column width="-1" type="actions" hidden="1"/>
-          <column width="-1" type="field" name="type" hidden="0"/>
+          <column width="-1" type="field" hidden="0" name="type"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -25713,12 +25732,12 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="id" editable="1"/>
-        <field name="type" editable="1"/>
+        <field editable="1" name="id"/>
+        <field editable="1" name="type"/>
       </editable>
       <labelOnTop>
-        <field name="id" labelOnTop="0"/>
-        <field name="type" labelOnTop="0"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="type"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -25726,7 +25745,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" simplifyLocal="1" autoRefreshTime="0" wkbType="Point" simplifyDrawingHints="0" type="vector" symbologyReferenceScale="-1" minScale="100000000" legendPlaceholderImage="" refreshOnNotifyEnabled="0" labelsEnabled="1" maxScale="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" refreshOnNotifyMessage="" readOnly="0" geometry="Point" autoRefreshEnabled="0" simplifyDrawingTol="1">
+    <maplayer simplifyLocal="1" simplifyDrawingHints="0" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1" legendPlaceholderImage="" symbologyReferenceScale="-1" readOnly="0" refreshOnNotifyEnabled="0" minScale="100000000" maxScale="0" type="vector" autoRefreshTime="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="1" styleCategories="AllStyleCategories" geometry="Point" autoRefreshEnabled="0" wkbType="Point">
       <extent>
         <xmin>18.4043294703937228</xmin>
         <ymin>-33.90631712958812471</ymin>
@@ -25799,58 +25818,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" startExpression="" mode="0" limitMode="0" endField="" fixedDuration="0" accumulate="0" durationUnit="min" startField="" endExpression="" enabled="0">
+      <temporal durationField="" fixedDuration="0" accumulate="0" endField="" startField="" enabled="0" startExpression="" endExpression="" durationUnit="min" mode="0" limitMode="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" zscale="1" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" binding="Centroid" type="IndividualFeatures" symbology="Line" extrusion="0" zoffset="0">
+      <elevation extrusionEnabled="0" symbology="Line" type="IndividualFeatures" zscale="1" clamping="Terrain" showMarkerSymbolInSurfacePlots="0" zoffset="0" extrusion="0" respectLayerSymbol="1" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="145,82,45,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="145,82,45,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -25881,36 +25900,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="145,82,45,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="104,59,32,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="145,82,45,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="104,59,32,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="145,82,45,255"/>
@@ -25925,44 +25944,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="145,82,45,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="104,59,32,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="145,82,45,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="diamond" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="104,59,32,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="3" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -25985,44 +26004,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" type="nullSymbol" symbollevels="0" referencescale="-1" enableorderby="0"/>
+      <renderer-v2 enableorderby="0" type="nullSymbol" symbollevels="0" referencescale="-1" forceraster="0"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="63" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="1" fieldName="label" useSubstitutions="0" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="15" namedStyle="Semibold" forcedItalic="0" isExpression="0" fontSizeUnit="Point" allowHtml="0" legendString="Aa">
+          <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="Semibold" fontUnderline="0" fieldName="label" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" useSubstitutions="0" fontWeight="63" fontStrikeout="0" fontItalic="0" fontSize="15" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" isExpression="0" legendString="Aa" textOrientation="horizontal">
             <families/>
-            <text-buffer bufferNoFill="1" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferDraw="1" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="0"/>
-            <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeBorderWidth="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-              <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <text-buffer bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+            <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskType="0"/>
+            <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
+              <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                    <Option value="255,255,255,255" type="QString" name="color"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                    <Option value="no" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="solid" type="QString" name="style"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                    <Option type="QString" value="255,255,255,255" name="color"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                    <Option type="QString" value="no" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="solid" name="style"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -26037,66 +26056,66 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+            <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format useMaxLineLengthForAutoWrap="1" leftDirectionSymbol="&lt;" wrapChar="" multilineAlign="3" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" decimals="3" rightDirectionSymbol=">" formatNumbers="0"/>
-          <placement overlapHandling="PreventOverlap" lineAnchorType="0" centroidInside="0" overrunDistance="0" centroidWhole="0" geometryGeneratorEnabled="0" rotationAngle="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" geometryGeneratorType="PointGeometry" quadOffset="4" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="0" xOffset="0" allowDegraded="0" lineAnchorTextPoint="CenterOfText" layerType="UnknownGeometry" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" maxCurvedCharAngleOut="-25" repeatDistance="0" offsetUnits="MM" repeatDistanceUnits="MM" dist="0" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" distUnits="MM" lineAnchorClipping="0" placementFlags="10" priority="5" overrunDistanceUnit="MM" maxCurvedCharAngleIn="25" geometryGenerator="" lineAnchorPercent="0.5" yOffset="0" rotationUnit="AngleDegrees"/>
-          <rendering fontMaxPixelSize="10000" drawLabels="1" mergeLines="0" zIndex="0" upsidedownLabels="0" obstacleFactor="1" scaleVisibility="0" limitNumLabels="0" obstacleType="0" fontLimitPixelSize="0" maxNumLabels="2000" minFeatureSize="0" fontMinPixelSize="3" labelPerPart="0" obstacle="1" scaleMax="0" scaleMin="0" unplacedVisibility="0"/>
+          <text-format wrapChar="" rightDirectionSymbol=">" plussign="0" leftDirectionSymbol="&lt;" formatNumbers="0" decimals="3" multilineAlign="3" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
+          <placement offsetUnits="MM" xOffset="0" maxCurvedCharAngleOut="-25" layerType="UnknownGeometry" allowDegraded="0" yOffset="0" overlapHandling="PreventOverlap" geometryGeneratorType="PointGeometry" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" repeatDistanceUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25" quadOffset="4" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidWhole="0" overrunDistance="0" overrunDistanceUnit="MM" centroidInside="0" placement="0" geometryGenerator="" priority="5" distUnits="MM" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" dist="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorTextPoint="CenterOfText" polygonPlacementFlags="2" rotationUnit="AngleDegrees" offsetType="0" placementFlags="10" repeatDistance="0"/>
+          <rendering limitNumLabels="0" obstacleType="0" obstacle="1" scaleMax="0" maxNumLabels="2000" labelPerPart="0" scaleMin="0" upsidedownLabels="0" zIndex="0" unplacedVisibility="0" fontLimitPixelSize="0" minFeatureSize="0" fontMaxPixelSize="10000" scaleVisibility="0" fontMinPixelSize="3" drawLabels="1" mergeLines="0" obstacleFactor="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-              <Option value="0" type="int" name="blendMode"/>
+              <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+              <Option type="int" value="0" name="blendMode"/>
               <Option type="Map" name="ddProperties">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
-              <Option value="false" type="bool" name="drawToAllParts"/>
-              <Option value="0" type="QString" name="enabled"/>
-              <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-              <Option value="&lt;symbol is_animated=&quot;0&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-              <Option value="0" type="double" name="minLength"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-              <Option value="MM" type="QString" name="minLengthUnit"/>
-              <Option value="0" type="double" name="offsetFromAnchor"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-              <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-              <Option value="0" type="double" name="offsetFromLabel"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-              <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+              <Option type="bool" value="false" name="drawToAllParts"/>
+              <Option type="QString" value="0" name="enabled"/>
+              <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
+              <Option type="QString" value="&lt;symbol alpha=&quot;1&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
+              <Option type="double" value="0" name="minLength"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
+              <Option type="QString" value="MM" name="minLengthUnit"/>
+              <Option type="double" value="0" name="offsetFromAnchor"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
+              <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
+              <Option type="double" value="0" name="offsetFromLabel"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
+              <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="QString" value="copy" name="QFieldSync/action"/>
+          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="0" name="embeddedWidgets/count"/>
           <Option type="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -26104,48 +26123,48 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory penAlpha="255" width="15" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" minimumSize="0" enabled="0" maxScaleDenominator="1e+08" diagramOrientation="Up" opacity="1" scaleBasedVisibility="0" spacingUnit="MM" minScaleDenominator="0" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" lineSizeType="MM" penWidth="0" backgroundAlpha="255" scaleDependency="Area" spacing="0" direction="1" barWidth="5" sizeType="MM" height="15" penColor="#000000" showAxis="0">
-          <fontProperties bold="0" style="0" italic="1" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" strikethrough="0"/>
-          <attribute label="" colorOpacity="1" field="" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory height="15" scaleDependency="Area" width="15" lineSizeScale="3x:0,0,0,0,0,0" spacingUnit="MM" lineSizeType="MM" penColor="#000000" spacing="0" labelPlacementMethod="XHeight" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" backgroundAlpha="255" maxScaleDenominator="1e+08" barWidth="5" penWidth="0" minimumSize="0" penAlpha="255" minScaleDenominator="0" sizeType="MM" backgroundColor="#ffffff" enabled="0" opacity="1" direction="1" scaleBasedVisibility="0" showAxis="0" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270">
+          <fontProperties style="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" strikethrough="0" italic="1" underline="0" bold="0"/>
+          <attribute color="#000000" field="" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="35,35,35,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0.26" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -26176,9 +26195,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -26186,20 +26205,20 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" showAll="1" placement="0" zIndex="0" dist="0" priority="0" obstacle="0">
+      <DiagramLayerSettings priority="0" linePlacementFlags="18" obstacle="0" dist="0" zIndex="0" placement="0" showAll="1">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field configurationFlags="None" name="id">
@@ -26218,29 +26237,29 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
-        <alias index="1" name="" field="label"/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="label" name=""/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="label"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="label" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="id" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="label" constraints="0"/>
+        <constraint exp_strength="0" field="id" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="label" notnull_strength="0" constraints="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" desc="" field="id"/>
-        <constraint exp="" desc="" field="label"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="label" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column width="-1" type="field" name="id" hidden="0"/>
-          <column width="-1" type="field" name="label" hidden="0"/>
+          <column width="-1" type="field" hidden="0" name="id"/>
+          <column width="-1" type="field" hidden="0" name="label"/>
           <column width="-1" type="actions" hidden="1"/>
         </columns>
       </attributetableconfig>
@@ -26273,12 +26292,12 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="id" editable="1"/>
-        <field name="label" editable="1"/>
+        <field editable="1" name="id"/>
+        <field editable="1" name="label"/>
       </editable>
       <labelOnTop>
-        <field name="id" labelOnTop="0"/>
-        <field name="label" labelOnTop="0"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="label"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -26286,18 +26305,18 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" simplifyLocal="1" autoRefreshTime="0" wkbType="MultiPolygon" simplifyDrawingHints="1" type="vector" symbologyReferenceScale="-1" minScale="100000000" legendPlaceholderImage="" refreshOnNotifyEnabled="0" labelsEnabled="1" maxScale="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" refreshOnNotifyMessage="" readOnly="0" geometry="Polygon" autoRefreshEnabled="0" simplifyDrawingTol="1">
+    <maplayer simplifyLocal="1" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1" legendPlaceholderImage="" symbologyReferenceScale="-1" readOnly="0" refreshOnNotifyEnabled="0" minScale="100000000" maxScale="0" type="vector" autoRefreshTime="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="1" styleCategories="AllStyleCategories" geometry="Polygon" autoRefreshEnabled="0" wkbType="MultiPolygon">
       <extent>
         <xmin>18.37549461152003971</xmin>
         <ymin>-33.94162201868364548</ymin>
-        <xmax>18.41847731903260055</xmax>
-        <ymax>-33.90724620464386163</ymax>
+        <xmax>18.4196941505527505</xmax>
+        <ymax>-33.91635128720449188</ymax>
       </extent>
       <wgs84extent>
         <xmin>18.37549461152003971</xmin>
         <ymin>-33.94162201868364548</ymin>
-        <xmax>18.41847731903260055</xmax>
-        <ymax>-33.90724620464386163</ymax>
+        <xmax>18.4196941505527505</xmax>
+        <ymax>-33.91635128720449188</ymax>
       </wgs84extent>
       <id>water_tables20170921142016467</id>
       <datasource>./water_tables.shp</datasource>
@@ -26351,7 +26370,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxy="0" minz="0" dimensions="2" maxx="0" maxz="0" miny="0" minx="0" crs=""/>
+          <spatial maxz="0" minx="0" maxx="0" minz="0" crs="" miny="0" maxy="0" dimensions="2"/>
           <temporal>
             <period>
               <start></start>
@@ -26376,58 +26395,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" startExpression="" mode="0" limitMode="0" endField="" fixedDuration="0" accumulate="0" durationUnit="min" startField="" endExpression="" enabled="0">
+      <temporal durationField="" fixedDuration="0" accumulate="0" endField="" startField="" enabled="0" startExpression="" endExpression="" durationUnit="min" mode="0" limitMode="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" zscale="1" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" binding="Centroid" type="IndividualFeatures" symbology="Line" extrusion="0" zoffset="0">
+      <elevation extrusionEnabled="0" symbology="Line" type="IndividualFeatures" zscale="1" clamping="Terrain" showMarkerSymbolInSurfacePlots="0" zoffset="0" extrusion="0" respectLayerSymbol="1" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="125,139,143,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="125,139,143,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -26458,36 +26477,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="125,139,143,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="89,99,102,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="125,139,143,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="89,99,102,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="125,139,143,255"/>
@@ -26502,44 +26521,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="125,139,143,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="89,99,102,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="125,139,143,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="diamond" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="89,99,102,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="3" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -26562,46 +26581,104 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" type="nullSymbol" symbollevels="0" referencescale="-1" enableorderby="0"/>
+      <renderer-v2 enableorderby="0" type="nullSymbol" symbollevels="0" referencescale="-1" forceraster="0"/>
       <labeling type="rule-based">
-        <rules key="{5dc8b36b-2058-4678-ad09-9a66ad011982}">
-          <rule filter="CASE&#xa;WHEN attribute( @atlas_feature , 'RouteLen' ) IS NULL THEN 1&#xa;WHEN regexp_match( &quot;races&quot;, attribute( @atlas_feature , 'RouteLen' ) ) THEN 1&#xa;ELSE 0&#xa;END" description="Show water tables" key="{6ef417ce-9c3a-42d0-a533-3a83b1a257ea}">
+        <rules key="{2bf934b8-ceac-4cd9-9cf0-74088d13e156}">
+          <rule description="Show water tables" key="{c438992b-4486-4e7d-a594-2c46fe177154}" filter="CASE&#xa;WHEN attribute( @atlas_feature , 'Source' ) IS NULL THEN 1&#xa;WHEN regexp_match( &quot;races&quot;, attribute( @atlas_feature , 'Source' ) ) THEN 1&#xa;ELSE 0&#xa;END">
             <settings calloutType="simple">
-              <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="75" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="31,120,180,255" textOpacity="0.90000000000000002" fieldName="label" useSubstitutions="0" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="8" namedStyle="Bold" forcedItalic="0" isExpression="0" fontSizeUnit="Point" allowHtml="0" legendString="Aa">
+              <text-style textOpacity="0.90000000000000002" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="Bold" fontUnderline="0" fieldName="label" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" useSubstitutions="0" fontWeight="75" fontStrikeout="0" fontItalic="0" fontSize="8" allowHtml="0" fontKerning="1" textColor="31,120,180,255" fontFamily="Myriad Pro" capitalization="0" isExpression="0" legendString="Aa" textOrientation="horizontal">
                 <families/>
-                <text-buffer bufferNoFill="0" bufferBlendMode="0" bufferSize="0.75" bufferJoinStyle="128" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="0.40000000000000002" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="0"/>
-                <background shapeRadiiY="0.5" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0.29999999999999999" shapeFillColor="255,255,255,204" shapeDraw="1" shapeBorderWidth="0.75" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0.75" shapeType="0" shapeJoinStyle="128" shapeOffsetUnit="MM" shapeBorderColor="31,120,206,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="0.59999999999999998" shapeOffsetY="-0.14999999999999999" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0.5" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-                  <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+                <text-buffer bufferNoFill="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="0.75" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="0.40000000000000002"/>
+                <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskType="0"/>
+                <background shapeRadiiY="0.5" shapeOffsetY="-0.14999999999999999" shapeSVGFile="" shapeRotation="0" shapeBorderColor="31,120,206,255" shapeRotationType="0" shapeSizeX="0.75" shapeDraw="1" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0.75" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,204" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="0.59999999999999998" shapeSizeY="0.29999999999999999" shapeRadiiX="0.5">
+                  <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="markerSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="255,255,255,204" type="QString" name="color"/>
-                        <Option value="round" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="31,120,206,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0.75" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="0" name="angle"/>
+                        <Option type="QString" value="square" name="cap_style"/>
+                        <Option type="QString" value="196,60,57,255" name="color"/>
+                        <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="circle" name="name"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="diameter" name="scale_method"/>
+                        <Option type="QString" value="2" name="size"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="size_unit"/>
+                        <Option type="QString" value="1" name="vertical_anchor_point"/>
+                      </Option>
+                      <prop k="angle" v="0"/>
+                      <prop k="cap_style" v="square"/>
+                      <prop k="color" v="196,60,57,255"/>
+                      <prop k="horizontal_anchor_point" v="1"/>
+                      <prop k="joinstyle" v="bevel"/>
+                      <prop k="name" v="circle"/>
+                      <prop k="offset" v="0,0"/>
+                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="offset_unit" v="MM"/>
+                      <prop k="outline_color" v="35,35,35,255"/>
+                      <prop k="outline_style" v="solid"/>
+                      <prop k="outline_width" v="0"/>
+                      <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="outline_width_unit" v="MM"/>
+                      <prop k="scale_method" v="diameter"/>
+                      <prop k="size" v="2"/>
+                      <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="size_unit" v="MM"/>
+                      <prop k="vertical_anchor_point" v="1"/>
+                      <data_defined_properties>
+                        <Option type="Map">
+                          <Option type="QString" value="" name="name"/>
+                          <Option name="properties"/>
+                          <Option type="QString" value="collection" name="type"/>
+                        </Option>
+                      </data_defined_properties>
+                    </layer>
+                  </symbol>
+                  <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option type="QString" value="" name="name"/>
+                        <Option name="properties"/>
+                        <Option type="QString" value="collection" name="type"/>
+                      </Option>
+                    </data_defined_properties>
+                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                      <Option type="Map">
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="255,255,255,204" name="color"/>
+                        <Option type="QString" value="round" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="31,120,206,255" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0.75" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="255,255,255,204"/>
@@ -26616,56 +26693,56 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format useMaxLineLengthForAutoWrap="1" leftDirectionSymbol="&lt;" wrapChar="" multilineAlign="1" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" decimals="3" rightDirectionSymbol=">" formatNumbers="0"/>
-              <placement overlapHandling="PreventOverlap" lineAnchorType="0" centroidInside="0" overrunDistance="0" centroidWhole="1" geometryGeneratorEnabled="0" rotationAngle="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" geometryGeneratorType="PointGeometry" quadOffset="1" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="0" xOffset="1" allowDegraded="0" lineAnchorTextPoint="CenterOfText" layerType="UnknownGeometry" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" maxCurvedCharAngleOut="-25" repeatDistance="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" dist="0" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" distUnits="MM" lineAnchorClipping="0" placementFlags="10" priority="5" overrunDistanceUnit="MM" maxCurvedCharAngleIn="25" geometryGenerator="" lineAnchorPercent="0.5" yOffset="0" rotationUnit="AngleDegrees"/>
-              <rendering fontMaxPixelSize="10000" drawLabels="1" mergeLines="0" zIndex="5" upsidedownLabels="0" obstacleFactor="0.76000000000000001" scaleVisibility="0" limitNumLabels="0" obstacleType="0" fontLimitPixelSize="0" maxNumLabels="6" minFeatureSize="0" fontMinPixelSize="3" labelPerPart="0" obstacle="1" scaleMax="10000000" scaleMin="1" unplacedVisibility="0"/>
+              <text-format wrapChar="" rightDirectionSymbol=">" plussign="0" leftDirectionSymbol="&lt;" formatNumbers="0" decimals="3" multilineAlign="1" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
+              <placement offsetUnits="MapUnit" xOffset="1" maxCurvedCharAngleOut="-25" layerType="PolygonGeometry" allowDegraded="0" yOffset="0" overlapHandling="PreventOverlap" geometryGeneratorType="PointGeometry" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" repeatDistanceUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25" quadOffset="1" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidWhole="1" overrunDistance="0" overrunDistanceUnit="MM" centroidInside="0" placement="0" geometryGenerator="" priority="5" distUnits="MM" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" dist="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorTextPoint="CenterOfText" polygonPlacementFlags="2" rotationUnit="AngleDegrees" offsetType="0" placementFlags="10" repeatDistance="0"/>
+              <rendering limitNumLabels="0" obstacleType="0" obstacle="1" scaleMax="10000000" maxNumLabels="6" labelPerPart="0" scaleMin="1" upsidedownLabels="0" zIndex="5" unplacedVisibility="0" fontLimitPixelSize="0" minFeatureSize="0" fontMaxPixelSize="10000" scaleVisibility="0" fontMinPixelSize="3" drawLabels="1" mergeLines="0" obstacleFactor="0.76000000000000001"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+                  <Option type="int" value="0" name="blendMode"/>
                   <Option type="Map" name="ddProperties">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
-                  <Option value="false" type="bool" name="drawToAllParts"/>
-                  <Option value="0" type="QString" name="enabled"/>
-                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                  <Option value="&lt;symbol is_animated=&quot;0&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                  <Option value="0" type="double" name="minLength"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                  <Option value="MM" type="QString" name="minLengthUnit"/>
-                  <Option value="0" type="double" name="offsetFromAnchor"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                  <Option value="0" type="double" name="offsetFromLabel"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                  <Option type="bool" value="false" name="drawToAllParts"/>
+                  <Option type="QString" value="0" name="enabled"/>
+                  <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
+                  <Option type="QString" value="&lt;symbol alpha=&quot;1&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
+                  <Option type="double" value="0" name="minLength"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
+                  <Option type="QString" value="MM" name="minLengthUnit"/>
+                  <Option type="double" value="0" name="offsetFromAnchor"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
+                  <Option type="double" value="0" name="offsetFromLabel"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
@@ -26674,11 +26751,16 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString" name="dualview/previewExpressions"/>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="QString" value="copy" name="QFieldSync/action"/>
+          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
+          <Option type="List" name="dualview/previewExpressions">
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+          </Option>
+          <Option type="QString" value="0" name="embeddedWidgets/count"/>
           <Option type="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -26686,48 +26768,48 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory penAlpha="255" width="15" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" minimumSize="0" enabled="0" maxScaleDenominator="1e+08" diagramOrientation="Up" opacity="1" scaleBasedVisibility="0" spacingUnit="MM" minScaleDenominator="0" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" lineSizeType="MM" penWidth="0" backgroundAlpha="255" scaleDependency="Area" spacing="0" direction="1" barWidth="5" sizeType="MM" height="15" penColor="#000000" showAxis="0">
-          <fontProperties bold="0" style="" italic="0" description="Roboto Condensed,11,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0"/>
-          <attribute label="" colorOpacity="1" field="" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory height="15" scaleDependency="Area" width="15" lineSizeScale="3x:0,0,0,0,0,0" spacingUnit="MM" lineSizeType="MM" penColor="#000000" spacing="0" labelPlacementMethod="XHeight" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" backgroundAlpha="255" maxScaleDenominator="1e+08" barWidth="5" penWidth="0" minimumSize="0" penAlpha="255" minScaleDenominator="0" sizeType="MM" backgroundColor="#ffffff" enabled="0" opacity="1" direction="1" scaleBasedVisibility="0" showAxis="0" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270">
+          <fontProperties style="" description="Roboto Condensed,11,-1,5,50,0,0,0,0,0" strikethrough="0" italic="0" underline="0" bold="0"/>
+          <attribute color="#000000" field="" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="35,35,35,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0.26" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -26758,9 +26840,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -26768,28 +26850,34 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="2" showAll="1" placement="0" zIndex="0" dist="0" priority="0" obstacle="0">
+      <DiagramLayerSettings priority="0" linePlacementFlags="2" obstacle="0" dist="0" zIndex="0" placement="0" showAll="1">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
-        <checkConfiguration/>
+        <checkConfiguration type="Map">
+          <Option type="Map" name="QgsGeometryGapCheck">
+            <Option type="double" value="0" name="allowedGapsBuffer"/>
+            <Option type="bool" value="false" name="allowedGapsEnabled"/>
+            <Option type="QString" value="" name="allowedGapsLayer"/>
+          </Option>
+        </checkConfiguration>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field configurationFlags="None" name="id">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -26798,8 +26886,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -26808,8 +26896,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -26821,42 +26909,54 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
+        <field configurationFlags="None" name="day">
+          <editWidget type="TextEdit">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
-        <alias index="1" name="" field="table_set"/>
-        <alias index="2" name="" field="label"/>
-        <alias index="3" name="" field="races"/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="table_set" name=""/>
+        <alias index="2" field="label" name=""/>
+        <alias index="3" field="races" name=""/>
+        <alias index="4" field="day" name=""/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="table_set"/>
-        <default applyOnUpdate="0" expression="" field="label"/>
-        <default applyOnUpdate="0" expression="" field="races"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="table_set" expression=""/>
+        <default applyOnUpdate="0" field="label" expression=""/>
+        <default applyOnUpdate="0" field="races" expression=""/>
+        <default applyOnUpdate="0" field="day" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="id" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="table_set" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="label" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="races" constraints="0"/>
+        <constraint exp_strength="0" field="id" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="table_set" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="label" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="races" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="day" notnull_strength="0" constraints="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" desc="" field="id"/>
-        <constraint exp="" desc="" field="table_set"/>
-        <constraint exp="" desc="" field="label"/>
-        <constraint exp="" desc="" field="races"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="table_set" desc=""/>
+        <constraint exp="" field="label" desc=""/>
+        <constraint exp="" field="races" desc=""/>
+        <constraint exp="" field="day" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="&quot;table_set&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="&quot;table_set&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column width="-1" type="field" name="id" hidden="0"/>
+          <column width="-1" type="field" hidden="0" name="id"/>
           <column width="-1" type="actions" hidden="1"/>
-          <column width="-1" type="field" name="table_set" hidden="0"/>
-          <column width="-1" type="field" name="label" hidden="0"/>
-          <column width="130" type="field" name="races" hidden="0"/>
+          <column width="-1" type="field" hidden="0" name="table_set"/>
+          <column width="-1" type="field" hidden="0" name="label"/>
+          <column width="-1" type="field" hidden="0" name="day"/>
+          <column width="130" type="field" hidden="0" name="races"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -26888,18 +26988,26 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="id" editable="1"/>
-        <field name="label" editable="1"/>
-        <field name="races" editable="1"/>
-        <field name="table_set" editable="1"/>
+        <field editable="1" name="day"/>
+        <field editable="1" name="id"/>
+        <field editable="1" name="label"/>
+        <field editable="1" name="races"/>
+        <field editable="1" name="table_set"/>
       </editable>
       <labelOnTop>
-        <field name="id" labelOnTop="0"/>
-        <field name="label" labelOnTop="0"/>
-        <field name="races" labelOnTop="0"/>
-        <field name="table_set" labelOnTop="0"/>
+        <field labelOnTop="0" name="day"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="label"/>
+        <field labelOnTop="0" name="races"/>
+        <field labelOnTop="0" name="table_set"/>
       </labelOnTop>
-      <reuseLastValue/>
+      <reuseLastValue>
+        <field reuseLastValue="0" name="day"/>
+        <field reuseLastValue="0" name="id"/>
+        <field reuseLastValue="0" name="label"/>
+        <field reuseLastValue="0" name="races"/>
+        <field reuseLastValue="0" name="table_set"/>
+      </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
@@ -26931,7 +27039,7 @@ def my_form_open(dialog, layer, feature):
     <layer id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0"/>
     <layer id="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792"/>
     <layer id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea"/>
-    <layer id="route_markers_d58f7174_b6d0_4e1c_80ed_0d74635b8ca6"/>
+    <layer id="route_markers_4e92bf25_f500_4b5f_bf49_9dd0b475a0c9"/>
   </layerorder>
   <properties>
     <DefaultStyles/>
@@ -27262,269 +27370,251 @@ def my_form_open(dialog, layer, feature):
   </properties>
   <dataDefinedServerProperties>
     <Option type="Map">
-      <Option value="" type="QString" name="name"/>
+      <Option type="QString" value="" name="name"/>
       <Option name="properties"/>
-      <Option value="collection" type="QString" name="type"/>
+      <Option type="QString" value="collection" name="type"/>
     </Option>
   </dataDefinedServerProperties>
   <visibility-presets>
     <visibility-preset has-expanded-info="1" name="Access Routes">
-      <layer style="default" visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer style="default" visible="1" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" expanded="1"/>
+      <layer id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" style="default" expanded="1" visible="1"/>
       <expanded-legend-nodes id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
-      <layer style="default" visible="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" expanded="0"/>
+      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default" expanded="0" visible="1"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" expanded="0" visible="1"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
       <expanded-group-nodes>
         <expanded-group-node id="Routes"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Map"/>
         <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Start and Finish pages"/>
+        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Elevation"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset has-expanded-info="1" name="Ask Me">
-      <layer style="default" visible="1" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" expanded="1"/>
+      <layer id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" style="default" expanded="1" visible="1"/>
       <expanded-legend-nodes id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
-      <layer style="default" visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer style="default" visible="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" expanded="1"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer style="default" visible="1" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" expanded="1"/>
+      <layer id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" style="default" expanded="1" visible="1"/>
       <expanded-legend-nodes id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
-      <layer style="default" visible="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" expanded="1"/>
+      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" expanded="1" visible="1"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default" expanded="1" visible="1"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" expanded="0" visible="1"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
       <expanded-group-nodes>
         <expanded-group-node id="Routes"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="Map"/>
+        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Ask Me"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Feeding Stations"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset has-expanded-info="1" name="Fencing">
-      <layer style="default" visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer style="default" visible="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" expanded="1"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer style="default" visible="1" id="water_tables20170921142016467" expanded="1"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer style="default" visible="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" expanded="1"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer style="Fencing" visible="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" expanded="1"/>
-      <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
-        <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
-        <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
-        <checked-legend-node id="{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 style="default" visible="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" expanded="1"/>
+      <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default" expanded="1" visible="1"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{ca3590cd-5839-41e2-824b-eca47a2b7a14}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default" expanded="1" visible="1"/>
+      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" expanded="1" visible="1"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer id="water_tables20170921142016467" style="default" expanded="1" visible="1"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="Fencing" expanded="1" visible="1"/>
+      <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
+        <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+        <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
+        <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
+        <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
+        <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+      </expanded-legend-nodes>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" expanded="0" visible="1"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Routes"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="Map"/>
+        <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Feeding Stations"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset has-expanded-info="1" name="Marshal map - inset">
-      <layer style="default" visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer style="default" visible="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" expanded="1"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer style="default" visible="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" expanded="1"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer style="default" visible="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" expanded="1"/>
+      <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default" expanded="1" visible="1"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" expanded="1" visible="1"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default" expanded="1" visible="1"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" expanded="0" visible="1"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Routes"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="Map"/>
+        <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Feeding Stations"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset has-expanded-info="1" name="Marshal map - main">
-      <layer style="default" visible="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" expanded="1"/>
+      <layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default" expanded="1" visible="1"/>
       <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer style="default" visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer style="default" visible="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" expanded="1"/>
+      <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default" expanded="1" visible="1"/>
+      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
+        <checked-legend-node id="{82ba5c12-5eaf-4bf1-af1a-89035ce48b3a}"/>
+        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
+        <checked-legend-node id="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default" expanded="1" visible="1"/>
       <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer style="default" visible="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" expanded="1"/>
+      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" expanded="1" visible="1"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer style="Fencing" visible="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" expanded="1"/>
+      <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="Fencing" expanded="1" visible="1"/>
       <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
+        <checked-legend-node id="{9da1c54c-0ca9-4db9-a722-ce3f53ccd358}"/>
         <checked-legend-node id="{b3b38ee9-c245-4839-b078-3b966a2a5c4e}"/>
         <checked-legend-node id="{bb4463e8-e33a-4475-878c-fd2d7b636418}"/>
-        <checked-legend-node id="{9da1c54c-0ca9-4db9-a722-ce3f53ccd358}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
-      <layer style="default" visible="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" expanded="1"/>
-      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
-        <checked-legend-node id="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}"/>
-        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
-        <checked-legend-node id="{82ba5c12-5eaf-4bf1-af1a-89035ce48b3a}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" expanded="0" visible="1"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
       <expanded-group-nodes>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Map"/>
         <expanded-group-node id="Fencing and Cones"/>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Feeding Stations"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset has-expanded-info="1" has-checked-group-info="1" name="Marshal overview">
-      <layer style="default" visible="0" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" expanded="1"/>
-      <expanded-legend-nodes id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea"/>
-      <layer style="default" visible="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" expanded="1"/>
+    <visibility-preset has-checked-group-info="1" has-expanded-info="1" name="Marshal overview">
+      <layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default" expanded="1" visible="1"/>
       <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
         <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer style="default" visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer style="default" visible="0" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" expanded="1"/>
+      <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default" expanded="1" visible="1"/>
+      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
+        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <layer id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" style="default" expanded="1" visible="0"/>
       <expanded-legend-nodes id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0"/>
-      <layer style="default" visible="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" expanded="0"/>
+      <layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default" expanded="0" visible="1"/>
       <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer style="default" visible="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" expanded="1"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer style="default" visible="0" id="water_tables20170921142016467" expanded="1"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer style="default" visible="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" expanded="1"/>
+      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" expanded="1" visible="1"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer style="Fencing" visible="0" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" expanded="1"/>
+      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default" expanded="1" visible="1"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer id="water_tables20170921142016467" style="default" expanded="1" visible="0"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="Fencing" expanded="1" visible="0"/>
       <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
-        <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
-        <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
-        <checked-legend-node id="{29865286-9e35-459b-929c-beb87e7538de}"/>
         <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
         <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
+        <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
+        <checked-legend-node id="{29865286-9e35-459b-929c-beb87e7538de}"/>
+        <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
       </expanded-legend-nodes>
-      <layer style="default" visible="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" expanded="1"/>
-      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
-        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <layer id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" style="default" expanded="1" visible="0"/>
+      <expanded-legend-nodes id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" expanded="0" visible="1"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
       <checked-group-nodes>
         <checked-group-node id="Routes"/>
-        <checked-group-node id="OSM data"/>
-        <checked-group-node id="Marshals"/>
-        <checked-group-node id="Routes/Markers"/>
         <checked-group-node id="Map"/>
+        <checked-group-node id="Marshals"/>
+        <checked-group-node id="OSM data"/>
+        <checked-group-node id="Routes/Markers"/>
       </checked-group-nodes>
       <expanded-group-nodes>
         <expanded-group-node id="Routes"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="Map"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Feeding Stations"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset has-expanded-info="1" has-checked-group-info="1" name="Routes">
-      <layer style="default" visible="0" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" expanded="1"/>
-      <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
-        <checked-legend-node id="{308d81eb-cefa-4627-8afb-3baa8363f863}"/>
-        <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer style="Fencing" visible="0" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" expanded="1"/>
-      <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
-        <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
-        <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
-        <checked-legend-node id="{29865286-9e35-459b-929c-beb87e7538de}"/>
-        <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 style="default" visible="1" id="route_markers_d58f7174_b6d0_4e1c_80ed_0d74635b8ca6" expanded="1"/>
-      <expanded-legend-nodes id="route_markers_d58f7174_b6d0_4e1c_80ed_0d74635b8ca6"/>
-      <layer style="default" visible="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" expanded="1"/>
+    <visibility-preset has-checked-group-info="1" has-expanded-info="1" name="Routes">
+      <layer id="route_markers_4e92bf25_f500_4b5f_bf49_9dd0b475a0c9" style="default" expanded="1" visible="1"/>
+      <expanded-legend-nodes id="route_markers_4e92bf25_f500_4b5f_bf49_9dd0b475a0c9"/>
+      <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default" expanded="1" visible="1"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer style="default" visible="0" id="water_tables20170921142016467" expanded="1"/>
+      <layer id="water_tables20170921142016467" style="default" expanded="1" visible="1"/>
       <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer style="default" visible="0" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" expanded="1"/>
-      <expanded-legend-nodes id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0"/>
-      <layer style="default" visible="0" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" expanded="1"/>
-      <expanded-legend-nodes id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea"/>
-      <layer style="default" visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" expanded="0" visible="1"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer style="default" visible="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" expanded="1"/>
+      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" expanded="1" visible="1"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer style="default" visible="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" expanded="1"/>
+      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default" expanded="1" visible="1"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <checked-group-nodes>
         <checked-group-node id="Routes"/>
+        <checked-group-node id="Map"/>
         <checked-group-node id="OSM data"/>
         <checked-group-node id="Routes/Markers"/>
-        <checked-group-node id="Map"/>
+        <checked-group-node id="Feeding Stations"/>
       </checked-group-nodes>
       <expanded-group-nodes>
         <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="Map"/>
+        <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Start and Finish pages"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Feeding Stations"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset has-expanded-info="1" name="Start/Finish">
-      <layer style="default" visible="1" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" expanded="1"/>
-      <expanded-legend-nodes id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
-      <layer style="default" visible="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" expanded="1"/>
+      <layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default" expanded="1" visible="1"/>
       <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer style="default" visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer style="default" visible="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" expanded="1"/>
+      <layer id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" style="default" expanded="1" visible="1"/>
+      <expanded-legend-nodes id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
+      <layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default" expanded="1" visible="1"/>
       <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer style="default" visible="1" id="water_tables20170921142016467" expanded="1"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer style="default" visible="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" expanded="1"/>
+      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" expanded="1" visible="1"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer style="Fencing" visible="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" expanded="1"/>
+      <layer id="water_tables20170921142016467" style="default" expanded="1" visible="1"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="Fencing" expanded="1" visible="1"/>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" expanded="0" visible="1"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Routes"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Marshal pages"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Start and Finish pages"/>
+        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Marshal pages"/>
       </expanded-group-nodes>
     </visibility-preset>
   </visibility-presets>
@@ -27551,31 +27641,31 @@ def my_form_open(dialog, layer, feature):
   </projectMetadata>
   <Annotations/>
   <Layouts>
-    <Layout name="Marshals" printResolution="120" worldFileMap="" units="mm">
-      <Snapper snapToItems="1" snapToGuides="1" tolerance="5" snapToGrid="0"/>
-      <Grid resUnits="mm" offsetUnits="mm" offsetY="0" offsetX="0" resolution="10"/>
+    <Layout units="mm" printResolution="120" worldFileMap="" name="Marshals">
+      <Snapper snapToGuides="1" tolerance="5" snapToGrid="0" snapToItems="1"/>
+      <Grid resolution="10" offsetY="0" offsetX="0" offsetUnits="mm" resUnits="mm"/>
       <PageCollection>
-        <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+        <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="255,255,255,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="no" type="QString" name="outline_style"/>
-              <Option value="0.26" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+              <Option type="QString" value="255,255,255,255" name="color"/>
+              <Option type="QString" value="miter" name="joinstyle"/>
+              <Option type="QString" value="0,0" name="offset"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+              <Option type="QString" value="MM" name="offset_unit"/>
+              <Option type="QString" value="0,0,0,255" name="outline_color"/>
+              <Option type="QString" value="no" name="outline_style"/>
+              <Option type="QString" value="0.26" name="outline_width"/>
+              <Option type="QString" value="MM" name="outline_width_unit"/>
+              <Option type="QString" value="solid" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
@@ -27590,49 +27680,49 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem outlineWidthM="0.3,mm" groupUuid="" position="0,0,mm" positionLock="false" templateUuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" uuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" type="65638" blendMode="0" size="297,210,mm" opacity="1" visibility="1" referencePoint="0" id="" frame="false" zValue="0" frameJoinStyle="miter" positionOnPage="0,0,mm" background="true" excludeFromExports="0" itemRotation="0">
-          <FrameColor red="0" green="0" blue="0" alpha="255"/>
-          <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+        <LayoutItem referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" groupUuid="" positionOnPage="0,0,mm" positionLock="false" frameJoinStyle="miter" frame="false" type="65638" outlineWidthM="0.3,mm" templateUuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" background="true" size="297,210,mm" zValue="0" uuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" opacity="1" position="0,0,mm" excludeFromExports="0">
+          <FrameColor alpha="255" red="0" blue="0" green="0"/>
+          <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="255,255,255,255" type="QString" name="color"/>
-                <Option value="miter" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="255,255,255,255" name="color"/>
+                <Option type="QString" value="miter" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                <Option type="QString" value="no" name="outline_style"/>
+                <Option type="QString" value="0.26" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -27647,9 +27737,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -27657,15 +27747,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem rasterBorderWidth="0" outlineWidthM="0.1,mm" maxSymbolSize="0" rasterBorderColor="0,0,0,255" frameJoinStyle="bevel" excludeFromExports="0" title="" columnCount="1" background="true" rasterBorder="1" boxSpace="2" size="39.4312,46.1,mm" map_uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" legendFilterByAtlas="0" wmsLegendHeight="25" columnSpace="2" type="65642" symbolAlignment="1" id="" positionLock="true" blendMode="0" positionOnPage="110.353,5.04491,mm" splitLayer="0" resizeToContents="1" templateUuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" frame="true" opacity="1" uuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" minSymbolSize="0" fontColor="#000000" lineSpacing="1" referencePoint="0" visibility="1" wrapChar="" itemRotation="0" symbolWidth="7" wmsLegendWidth="50" groupUuid="" position="110.353,5.04491,mm" symbolHeight="4" equalColumnWidth="1" titleAlignment="1" zValue="5">
-        <FrameColor red="128" green="128" blue="128" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem splitLayer="0" size="39.4312,46.1,mm" legendFilterByAtlas="0" boxSpace="2" templateUuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" blendMode="0" maxSymbolSize="0" position="110.353,5.04491,mm" groupUuid="" wrapChar="" minSymbolSize="0" referencePoint="0" symbolAlignment="1" itemRotation="0" title="" equalColumnWidth="1" resizeToContents="1" wmsLegendHeight="25" columnCount="1" outlineWidthM="0.1,mm" rasterBorder="1" background="true" visibility="1" symbolHeight="4" fontColor="#000000" positionLock="true" zValue="5" titleAlignment="1" lineSpacing="1" columnSpace="2" id="" rasterBorderColor="0,0,0,255" positionOnPage="110.353,5.04491,mm" excludeFromExports="0" rasterBorderWidth="0" type="65642" wmsLegendWidth="50" uuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" opacity="1" frame="true" symbolWidth="7" map_uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" frameJoinStyle="bevel">
+        <FrameColor alpha="255" red="128" blue="128" green="128"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -27673,48 +27763,48 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style name="title" indent="0" alignment="1">
-            <styleFont bold="0" style="Regular" italic="0" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" underline="0" strikethrough="0"/>
+          <style indent="0" alignment="1" name="title">
+            <styleFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" strikethrough="0" italic="0" underline="0" bold="0"/>
           </style>
-          <style name="group" indent="0" alignment="1">
-            <styleFont bold="1" style="Semibold" italic="0" description="Myriad Pro,11,-1,5,75,0,0,0,0,0,Semibold" underline="0" strikethrough="0"/>
+          <style indent="0" alignment="1" name="group">
+            <styleFont style="Semibold" description="Myriad Pro,11,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0" italic="0" underline="0" bold="1"/>
           </style>
-          <style name="subgroup" indent="0" alignment="1" marginTop="1">
-            <styleFont bold="1" style="Semibold" italic="0" description="Myriad Pro,9,-1,5,75,0,0,0,0,0,Semibold" underline="0" strikethrough="0"/>
+          <style marginTop="1" indent="0" alignment="1" name="subgroup">
+            <styleFont style="Semibold" description="Myriad Pro,9,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0" italic="0" underline="0" bold="1"/>
           </style>
-          <style name="symbol" indent="0" alignment="1" marginTop="2">
-            <styleFont bold="0" style="" italic="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0"/>
+          <style marginTop="2" indent="0" alignment="1" name="symbol">
+            <styleFont style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0" strikethrough="0" italic="0" underline="0" bold="0"/>
           </style>
-          <style marginLeft="2" name="symbolLabel" indent="0" alignment="1" marginTop="2">
-            <styleFont bold="1" style="Semibold" italic="0" description="Myriad Pro,8,-1,5,75,0,0,0,0,0,Semibold" underline="0" strikethrough="0"/>
+          <style marginTop="2" marginLeft="2" indent="0" alignment="1" name="symbolLabel">
+            <styleFont style="Semibold" description="Myriad Pro,8,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0" italic="0" underline="0" bold="1"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group checked="Qt::Checked" name="Routes" groupLayer="" expanded="1">
+          <layer-tree-group expanded="1" groupLayer="" checked="Qt::Checked" name="Routes">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer checked="Qt::Checked" legend_exp="" source="./all_routes.shp|layername=all_routes" name="all_routes" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" providerKey="ogr" legend_split_behavior="0" patch_size="0,0" expanded="1">
+            <layer-tree-layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" expanded="1" legend_split_behavior="0" source="./all_routes.shp|layername=all_routes" legend_exp="" providerKey="ogr" patch_size="0,0" checked="Qt::Checked" name="all_routes">
               <customproperties>
                 <Option type="Map">
-                  <Option value="1,2,3" type="QString" name="legend/node-order"/>
-                  <Option value="hidden" type="QString" name="legend/title-style"/>
+                  <Option type="QString" value="1,2,3" name="legend/node-order"/>
+                  <Option type="QString" value="hidden" name="legend/title-style"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
-          <layer-tree-group checked="Qt::Unchecked" name="Fencing and Cones" groupLayer="" expanded="1">
+          <layer-tree-group expanded="1" groupLayer="" checked="Qt::Unchecked" name="Fencing and Cones">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer checked="Qt::Checked" legend_exp="" source="./fencing.shp|layername=fencing" name="fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" providerKey="ogr" legend_split_behavior="0" patch_size="0,0" expanded="1">
+            <layer-tree-layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" expanded="1" legend_split_behavior="0" source="./fencing.shp|layername=fencing" legend_exp="" providerKey="ogr" patch_size="0,0" checked="Qt::Checked" name="fencing">
               <customproperties>
                 <Option type="Map">
-                  <Option value="0,1,2" type="QString" name="legend/node-order"/>
-                  <Option value="hidden" type="QString" name="legend/title-style"/>
+                  <Option type="QString" value="0,1,2" name="legend/node-order"/>
+                  <Option type="QString" value="hidden" name="legend/title-style"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -27722,62 +27812,62 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.2,mm" groupUuid="" position="98.7828,149.027,mm" positionLock="true" templateUuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" uuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" type="65639" blendMode="0" followPresetName="Marshal map - inset" keepLayerSet="false" size="56.5192,54.5647,mm" opacity="1" visibility="1" referencePoint="0" id="" frame="true" followPreset="true" zValue="4" frameJoinStyle="miter" labelMargin="0,mm" positionOnPage="98.7828,149.027,mm" mapRotation="0" background="true" excludeFromExports="0" itemRotation="0" drawCanvasItems="false" mapFlags="0" isTemporal="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" drawCanvasItems="false" mapRotation="0" mapFlags="0" groupUuid="" positionOnPage="98.7828,149.027,mm" positionLock="true" frameJoinStyle="miter" followPresetName="Marshal map - inset" frame="true" type="65639" outlineWidthM="0.2,mm" labelMargin="0,mm" templateUuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" background="true" size="56.5192,54.5647,mm" zValue="4" uuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" opacity="1" position="98.7828,149.027,mm" keepLayerSet="false" excludeFromExports="0" isTemporal="0" followPreset="true">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.41064302246786966" ymax="-33.89902512102636223" ymin="-33.90316824413850583" xmax="18.41493455420295433"/>
+        <Extent ymax="-33.89902512102636223" xmin="18.41064302246786966" ymin="-33.90316824413850583" xmax="18.41493455420295433"/>
         <LayerSet/>
-        <ComposerMapGrid show="0" rotatedTicksEnabled="0" gridFrameStyle="0" crossLength="3" gridFrameMargin="0" leftFrameDivisions="0" bottomFrameDivisions="0" gridFramePenThickness="0.5" topAnnotationDisplay="0" topAnnotationPosition="1" rotatedTicksMinimumAngle="0" name="Grid 1" showAnnotation="0" rotatedAnnotationsEnabled="0" rotatedTicksLengthMode="0" annotationExpression="" intervalX="0" bottomAnnotationPosition="1" rightAnnotationDisplay="0" rotatedAnnotationsMinimumAngle="0" annotationPrecision="3" frameFillColor1="255,255,255,255" blendMode="0" offsetY="0" gridFrameWidth="2" leftAnnotationDisplay="0" uuid="{3ef84102-ed03-4cdc-8cad-41bf1801eda2}" rotatedAnnotationsMarginToCorner="0" topFrameDivisions="0" topAnnotationDirection="0" rightAnnotationPosition="1" rotatedTicksMarginToCorner="0" gridStyle="0" minimumIntervalWidth="50" intervalY="0" unit="0" maximumIntervalWidth="100" gridFrameSideFlags="15" frameAnnotationDistance="1" frameFillColor2="0,0,0,255" rightAnnotationDirection="0" position="3" bottomAnnotationDisplay="0" leftAnnotationPosition="1" rotatedAnnotationsLengthMode="0" annotationFormat="0" gridFramePenColor="0,0,0,255" leftAnnotationDirection="0" rightFrameDivisions="0" bottomAnnotationDirection="0" offsetX="0">
+        <ComposerMapGrid bottomAnnotationPosition="1" frameFillColor2="0,0,0,255" blendMode="0" bottomAnnotationDisplay="0" name="Grid 1" frameFillColor1="255,255,255,255" position="3" bottomFrameDivisions="0" topAnnotationPosition="1" crossLength="3" leftAnnotationDisplay="0" intervalY="0" rotatedAnnotationsMarginToCorner="0" gridFrameStyle="0" annotationFormat="0" topAnnotationDirection="0" leftFrameDivisions="0" topFrameDivisions="0" annotationPrecision="3" rotatedTicksMinimumAngle="0" rightFrameDivisions="0" maximumIntervalWidth="100" unit="0" rotatedTicksEnabled="0" topAnnotationDisplay="0" leftAnnotationPosition="1" show="0" rotatedTicksMarginToCorner="0" rotatedTicksLengthMode="0" gridStyle="0" rotatedAnnotationsMinimumAngle="0" minimumIntervalWidth="50" bottomAnnotationDirection="0" annotationExpression="" intervalX="0" offsetY="0" offsetX="0" gridFramePenColor="0,0,0,255" gridFrameMargin="0" gridFrameWidth="2" rightAnnotationDisplay="0" rotatedAnnotationsEnabled="0" leftAnnotationDirection="0" rightAnnotationDirection="0" gridFrameSideFlags="15" gridFramePenThickness="0.5" showAnnotation="0" uuid="{3ef84102-ed03-4cdc-8cad-41bf1801eda2}" rightAnnotationPosition="1" frameAnnotationDistance="1" rotatedAnnotationsLengthMode="0">
           <lineStyle>
-            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0,0,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0,0,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -27808,44 +27898,44 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+              <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="angle"/>
-                  <Option value="square" type="QString" name="cap_style"/>
-                  <Option value="0,0,0,255" type="QString" name="color"/>
-                  <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="circle" type="QString" name="name"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                  <Option value="solid" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="diameter" type="QString" name="scale_method"/>
-                  <Option value="2" type="QString" name="size"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="size_unit"/>
-                  <Option value="1" type="QString" name="vertical_anchor_point"/>
+                  <Option type="QString" value="0" name="angle"/>
+                  <Option type="QString" value="square" name="cap_style"/>
+                  <Option type="QString" value="0,0,0,255" name="color"/>
+                  <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="circle" name="name"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                  <Option type="QString" value="solid" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="diameter" name="scale_method"/>
+                  <Option type="QString" value="2" name="size"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="size_unit"/>
+                  <Option type="QString" value="1" name="vertical_anchor_point"/>
                 </Option>
                 <prop k="angle" v="0"/>
                 <prop k="cap_style" v="square"/>
@@ -27868,40 +27958,40 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="50" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="1" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="10" namedStyle="" forcedItalic="0" fontSizeUnit="Point" allowHtml="0">
+          <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="" fontUnderline="0" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" fontWeight="50" fontStrikeout="0" fontItalic="0" fontSize="10" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" textOrientation="horizontal">
             <families/>
-            <text-buffer bufferNoFill="1" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="1.5"/>
-            <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeBorderWidth="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-              <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <text-buffer bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+            <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskType="0"/>
+            <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
+              <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                    <Option value="255,255,255,255" type="QString" name="color"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                    <Option value="no" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="solid" type="QString" name="style"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                    <Option type="QString" value="255,255,255,255" name="color"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                    <Option type="QString" value="no" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="solid" name="style"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -27916,29 +28006,29 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+            <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -27946,28 +28036,28 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <ComposerMapOverview inverted="0" centered="1" uuid="{00880e74-3a34-4c80-a062-9e7dfc538d75}" show="1" frameMap="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" position="3" blendMode="0" name="Overview 1">
-          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+        <ComposerMapOverview blendMode="0" inverted="0" frameMap="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" centered="1" position="3" uuid="{00880e74-3a34-4c80-a062-9e7dfc538d75}" show="1" name="Overview 1">
+          <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="0,65,170,127" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,102" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="0,65,170,127" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="35,35,35,102" name="outline_color"/>
+                <Option type="QString" value="no" name="outline_style"/>
+                <Option type="QString" value="0.26" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="0,65,170,127"/>
@@ -27982,9 +28072,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -27992,9 +28082,9 @@ def my_form_open(dialog, layer, feature):
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -28002,69 +28092,69 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapOverview>
-        <AtlasMap margin="0.10000000000000001" atlasDriven="1" scalingMode="0"/>
+        <AtlasMap margin="0.10000000000000001" scalingMode="0" atlasDriven="1"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" enabled="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clipSource="" enabled="0" clippingType="0"/>
+        <itemClippingSettings clipSource="" forceLabelsInside="0" clippingType="0" enabled="0"/>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" groupUuid="" position="3.53,6.0007,mm" positionLock="true" templateUuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" type="65639" blendMode="0" followPresetName="Marshal map - main" keepLayerSet="false" size="142,187.018,mm" opacity="1" visibility="1" referencePoint="0" id="" frame="false" followPreset="true" zValue="3" frameJoinStyle="miter" labelMargin="0,mm" positionOnPage="3.53,6.0007,mm" mapRotation="0" background="false" excludeFromExports="0" itemRotation="0" drawCanvasItems="false" mapFlags="0" isTemporal="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" drawCanvasItems="false" mapRotation="0" mapFlags="0" groupUuid="" positionOnPage="3.53,6.0007,mm" positionLock="true" frameJoinStyle="miter" followPresetName="Marshal map - main" frame="false" type="65639" outlineWidthM="0.3,mm" labelMargin="0,mm" templateUuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" background="false" size="142,187.018,mm" zValue="3" uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" opacity="1" position="3.53,6.0007,mm" keepLayerSet="false" excludeFromExports="0" isTemporal="0" followPreset="true">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.41227535330844844" ymax="-33.90042047455022356" ymin="-33.9017728906146445" xmax="18.41330222336237554"/>
+        <Extent ymax="-33.90042047455022356" xmin="18.41227535330844844" ymin="-33.9017728906146445" xmax="18.41330222336237554"/>
         <LayerSet/>
-        <ComposerMapGrid show="0" rotatedTicksEnabled="0" gridFrameStyle="0" crossLength="3" gridFrameMargin="0" leftFrameDivisions="0" bottomFrameDivisions="0" gridFramePenThickness="0.5" topAnnotationDisplay="0" topAnnotationPosition="1" rotatedTicksMinimumAngle="0" name="Grid 1" showAnnotation="0" rotatedAnnotationsEnabled="0" rotatedTicksLengthMode="0" annotationExpression="" intervalX="0" bottomAnnotationPosition="1" rightAnnotationDisplay="0" rotatedAnnotationsMinimumAngle="0" annotationPrecision="3" frameFillColor1="255,255,255,255" blendMode="0" offsetY="0" gridFrameWidth="2" leftAnnotationDisplay="0" uuid="{c6f52ccd-dffd-428e-8bbf-f3d65e856d30}" rotatedAnnotationsMarginToCorner="0" topFrameDivisions="0" topAnnotationDirection="0" rightAnnotationPosition="1" rotatedTicksMarginToCorner="0" gridStyle="0" minimumIntervalWidth="50" intervalY="0" unit="0" maximumIntervalWidth="100" gridFrameSideFlags="15" frameAnnotationDistance="1" frameFillColor2="0,0,0,255" rightAnnotationDirection="0" position="3" bottomAnnotationDisplay="0" leftAnnotationPosition="1" rotatedAnnotationsLengthMode="0" annotationFormat="0" gridFramePenColor="0,0,0,255" leftAnnotationDirection="0" rightFrameDivisions="0" bottomAnnotationDirection="0" offsetX="0">
+        <ComposerMapGrid bottomAnnotationPosition="1" frameFillColor2="0,0,0,255" blendMode="0" bottomAnnotationDisplay="0" name="Grid 1" frameFillColor1="255,255,255,255" position="3" bottomFrameDivisions="0" topAnnotationPosition="1" crossLength="3" leftAnnotationDisplay="0" intervalY="0" rotatedAnnotationsMarginToCorner="0" gridFrameStyle="0" annotationFormat="0" topAnnotationDirection="0" leftFrameDivisions="0" topFrameDivisions="0" annotationPrecision="3" rotatedTicksMinimumAngle="0" rightFrameDivisions="0" maximumIntervalWidth="100" unit="0" rotatedTicksEnabled="0" topAnnotationDisplay="0" leftAnnotationPosition="1" show="0" rotatedTicksMarginToCorner="0" rotatedTicksLengthMode="0" gridStyle="0" rotatedAnnotationsMinimumAngle="0" minimumIntervalWidth="50" bottomAnnotationDirection="0" annotationExpression="" intervalX="0" offsetY="0" offsetX="0" gridFramePenColor="0,0,0,255" gridFrameMargin="0" gridFrameWidth="2" rightAnnotationDisplay="0" rotatedAnnotationsEnabled="0" leftAnnotationDirection="0" rightAnnotationDirection="0" gridFrameSideFlags="15" gridFramePenThickness="0.5" showAnnotation="0" uuid="{c6f52ccd-dffd-428e-8bbf-f3d65e856d30}" rightAnnotationPosition="1" frameAnnotationDistance="1" rotatedAnnotationsLengthMode="0">
           <lineStyle>
-            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0,0,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0,0,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -28095,44 +28185,44 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+              <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="angle"/>
-                  <Option value="square" type="QString" name="cap_style"/>
-                  <Option value="0,0,0,255" type="QString" name="color"/>
-                  <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="circle" type="QString" name="name"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                  <Option value="solid" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="diameter" type="QString" name="scale_method"/>
-                  <Option value="2" type="QString" name="size"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="size_unit"/>
-                  <Option value="1" type="QString" name="vertical_anchor_point"/>
+                  <Option type="QString" value="0" name="angle"/>
+                  <Option type="QString" value="square" name="cap_style"/>
+                  <Option type="QString" value="0,0,0,255" name="color"/>
+                  <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="circle" name="name"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                  <Option type="QString" value="solid" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="diameter" name="scale_method"/>
+                  <Option type="QString" value="2" name="size"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="size_unit"/>
+                  <Option type="QString" value="1" name="vertical_anchor_point"/>
                 </Option>
                 <prop k="angle" v="0"/>
                 <prop k="cap_style" v="square"/>
@@ -28155,40 +28245,40 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="50" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="1" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="10" namedStyle="" forcedItalic="0" fontSizeUnit="Point" allowHtml="0">
+          <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="" fontUnderline="0" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" fontWeight="50" fontStrikeout="0" fontItalic="0" fontSize="10" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" textOrientation="horizontal">
             <families/>
-            <text-buffer bufferNoFill="1" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="1.5"/>
-            <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeBorderWidth="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-              <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <text-buffer bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+            <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskType="0"/>
+            <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
+              <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                    <Option value="255,255,255,255" type="QString" name="color"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                    <Option value="no" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="solid" type="QString" name="style"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                    <Option type="QString" value="255,255,255,255" name="color"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                    <Option type="QString" value="no" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="solid" name="style"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -28203,29 +28293,29 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+            <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -28233,22 +28323,22 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap margin="0.10000000000000001" atlasDriven="1" scalingMode="0"/>
+        <AtlasMap margin="0.10000000000000001" scalingMode="0" atlasDriven="1"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" enabled="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clipSource="" enabled="0" clippingType="0"/>
+        <itemClippingSettings clipSource="" forceLabelsInside="0" clippingType="0" enabled="0"/>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" groupUuid="" position="290.617,6.0007,mm" hidePageIfEmpty="0" positionLock="true" templateUuid="{29f4a843-0516-4360-b00e-581dbc907eda}" uuid="{29f4a843-0516-4360-b00e-581dbc907eda}" multiFrame="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" type="65647" blendMode="0" size="142.117,187.018,mm" opacity="1" sectionWidth="142.117" visibility="1" referencePoint="2" hideBackgroundIfEmpty="0" id="" frame="false" zValue="2" frameJoinStyle="round" sectionHeight="182.4" multiFrameTemplateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" positionOnPage="290.617,6.0007,mm" sectionY="0" sectionX="0" background="false" excludeFromExports="0" itemRotation="0">
-        <FrameColor red="119" green="119" blue="119" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem referencePoint="2" blendMode="0" sectionWidth="142.117" itemRotation="0" id="" visibility="1" groupUuid="" positionOnPage="290.617,6.0007,mm" positionLock="true" frameJoinStyle="round" sectionHeight="182.4" frame="false" type="65647" outlineWidthM="0.3,mm" templateUuid="{29f4a843-0516-4360-b00e-581dbc907eda}" background="false" sectionY="0" size="142.117,187.018,mm" zValue="2" uuid="{29f4a843-0516-4360-b00e-581dbc907eda}" opacity="1" hideBackgroundIfEmpty="0" position="290.617,6.0007,mm" sectionX="0" excludeFromExports="0" multiFrameTemplateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" multiFrame="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" hidePageIfEmpty="0">
+        <FrameColor alpha="255" red="119" blue="119" green="119"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -28256,21 +28346,21 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" groupUuid="" position="246.665,178.41,mm" anchorPoint="0" positionLock="true" svgFillColor="255,255,255,255" templateUuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" uuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" type="65640" blendMode="0" size="47.1065,27.6,mm" opacity="1" visibility="1" svgBorderColor="0,0,0,255" northMode="0" northOffset="0" referencePoint="0" id="" frame="false" zValue="1" mode="1" frameJoinStyle="miter" resizeMode="0" positionOnPage="246.665,178.41,mm" file="../Gun_Run_Logo.png" svgBorderWidth="0.2" pictureRotation="0" background="false" pictureHeight="27.6" pictureWidth="27.4317" excludeFromExports="0" itemRotation="0" mapUuid="">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" mapUuid="" svgBorderWidth="0.2" pictureHeight="27.6" groupUuid="" positionOnPage="246.665,178.41,mm" positionLock="true" frameJoinStyle="miter" mode="1" frame="false" type="65640" outlineWidthM="0.3,mm" resizeMode="0" file="../Gun_Run_Logo.png" northOffset="0" templateUuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" background="false" svgFillColor="255,255,255,255" pictureRotation="0" size="47.1065,27.6,mm" zValue="1" uuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" svgBorderColor="0,0,0,255" northMode="0" opacity="1" position="246.665,178.41,mm" excludeFromExports="0" pictureWidth="27.4317" anchorPoint="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedSource">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -28278,14 +28368,14 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutMultiFrame html="&lt;table>&#xa;&lt;tr>&lt;td width=&quot;45%&quot;>Position&lt;/td>&lt;td width=&quot;55%&quot;>&lt;b>[%&quot;position&quot;%]&lt;/b>&lt;/td>&lt;/tr>&#xa;[%if ( &quot;csv_club&quot; = 'AAC', '&lt;tr>&lt;td>Name&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_club&quot; = 'AAC', &quot;csv_name&quot;, '')%]&#xa;[%if ( &quot;csv_club&quot; = 'AAC', '&lt;/td>&lt;/tr>', '')%]&#xa;&lt;tr>&lt;td>Club&lt;/td>&lt;td>[%csv_club%]&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Captain&lt;/td>&lt;td>[%csv_captain%]&lt;/td>&lt;/tr>&#xa;&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;tr>&lt;td>Last Runner&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, &quot;csv_last_runner&quot;, '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;/td>&lt;tr>', '')%]&#xa;&#xa;&lt;tr>&lt;td colspan=2>&lt;b>Contact Numbers&lt;b>&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>VOC&lt;/td>&lt;td width=&quot;120&quot;>&lt;b>021 430 7374&amp;nbsp;&amp;nbsp;(emergencies)&lt;/b>&lt;/td>&lt;/tr>&#xa;&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', '&lt;tr>&lt;td>')%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', &quot;csv_captain&quot;)%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', '&amp;nbsp;&lt;/td>&lt;td>')%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', &quot;csv_captain_phone&quot;)%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', '&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;/table>&#xa;&#xa;&lt;p>&lt;b>[% &quot;csv_instructions&quot; %]&lt;/b>&lt;/p>&#xa;&#xa;&lt;p>Please return your bib and flag to the information desk at the finish (accessible from Vlei Road or Stephen Way).&lt;/p>&#xa;&lt;p style=&quot;text-align: right&quot;>Thank you!&lt;/p>" stylesheet="td, p {&#xa;&#x9;font-family: &quot;Myriad Pro&quot;, sans-serif;&#xa;&#x9;font-size: 5pt;&#xa;}&#xa;p {&#xa;&#x9;text-align: justify;&#xa;}&#xa;b{&#xa;&#x9;font-weight: 600;&#xa;}" stylesheetEnabled="true" uuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" templateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" resizeMode="0" url="" evaluateExpressions="true" useSmartBreaks="true" maxBreakDistance="12" type="65648" contentMode="1">
-        <childFrame uuid="{29f4a843-0516-4360-b00e-581dbc907eda}" templateUuid="{29f4a843-0516-4360-b00e-581dbc907eda}"/>
+      <LayoutMultiFrame useSmartBreaks="true" type="65648" templateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" stylesheetEnabled="true" resizeMode="0" uuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" 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;[%if ( &quot;csv_club&quot; = 'AAC', '&lt;tr>&lt;td>Name&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_club&quot; = 'AAC', &quot;csv_name&quot;, '')%]&#xa;[%if ( &quot;csv_club&quot; = 'AAC', '&lt;/td>&lt;/tr>', '')%]&#xa;&lt;tr>&lt;td>Club&lt;/td>&lt;td>[%csv_club%]&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Captain&lt;/td>&lt;td>[%csv_captain%]&lt;/td>&lt;/tr>&#xa;&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;tr>&lt;td>Last Runner&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, &quot;csv_last_runner&quot;, '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;/td>&lt;tr>', '')%]&#xa;&#xa;&lt;tr>&lt;td colspan=2>&lt;b>Contact Numbers&lt;b>&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>VOC&lt;/td>&lt;td width=&quot;120&quot;>&lt;b>021 430 7374&amp;nbsp;&amp;nbsp;(emergencies)&lt;/b>&lt;/td>&lt;/tr>&#xa;&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', '&lt;tr>&lt;td>')%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', &quot;csv_captain&quot;)%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', '&amp;nbsp;&lt;/td>&lt;td>')%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', &quot;csv_captain_phone&quot;)%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', '&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;/table>&#xa;&#xa;&lt;p>&lt;b>[% &quot;csv_instructions&quot; %]&lt;/b>&lt;/p>&#xa;&#xa;&lt;p>Please return your bib and flag to the information desk at the finish (accessible from Vlei Road or Stephen Way).&lt;/p>&#xa;&lt;p style=&quot;text-align: right&quot;>Thank you!&lt;/p>" 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;}" url="" maxBreakDistance="12" contentMode="1">
+        <childFrame templateUuid="{29f4a843-0516-4360-b00e-581dbc907eda}" uuid="{29f4a843-0516-4360-b00e-581dbc907eda}"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -28295,53 +28385,53 @@ def my_form_open(dialog, layer, feature):
       </LayoutMultiFrame>
       <customproperties>
         <Option type="Map">
-          <Option value="jpg" type="QString" name="atlasRasterFormat"/>
-          <Option value="0" type="QString" name="forceVector"/>
-          <Option value="true" type="QString" name="imageAntialias"/>
-          <Option value="0" type="QString" name="imageCropMarginBottom"/>
-          <Option value="0" type="QString" name="imageCropMarginLeft"/>
-          <Option value="0" type="QString" name="imageCropMarginRight"/>
-          <Option value="0" type="QString" name="imageCropMarginTop"/>
-          <Option value="0" type="QString" name="imageCropMarginUnit"/>
-          <Option value="false" type="QString" name="imageCropToContents"/>
-          <Option value="0" type="QString" name="pdfDisableRasterTiles"/>
-          <Option value="1" type="QString" name="pdfIncludeMetadata"/>
-          <Option value="0" type="QString" name="pdfTextFormat"/>
-          <Option value="false" type="QString" name="rasterize"/>
-          <Option value="3.53" type="QString" name="resizeToContentsBottomMargin"/>
-          <Option value="3.53" type="QString" name="resizeToContentsLeftMargin"/>
-          <Option value="3.53" type="QString" name="resizeToContentsRightMargin"/>
-          <Option value="3.53" type="QString" name="resizeToContentsTopMargin"/>
-          <Option value="false" type="QString" name="singleFile"/>
+          <Option type="QString" value="jpg" name="atlasRasterFormat"/>
+          <Option type="QString" value="0" name="forceVector"/>
+          <Option type="QString" value="true" name="imageAntialias"/>
+          <Option type="QString" value="0" name="imageCropMarginBottom"/>
+          <Option type="QString" value="0" name="imageCropMarginLeft"/>
+          <Option type="QString" value="0" name="imageCropMarginRight"/>
+          <Option type="QString" value="0" name="imageCropMarginTop"/>
+          <Option type="QString" value="0" name="imageCropMarginUnit"/>
+          <Option type="QString" value="false" name="imageCropToContents"/>
+          <Option type="QString" value="0" name="pdfDisableRasterTiles"/>
+          <Option type="QString" value="1" name="pdfIncludeMetadata"/>
+          <Option type="QString" value="0" name="pdfTextFormat"/>
+          <Option type="QString" value="false" name="rasterize"/>
+          <Option type="QString" value="3.53" name="resizeToContentsBottomMargin"/>
+          <Option type="QString" value="3.53" name="resizeToContentsLeftMargin"/>
+          <Option type="QString" value="3.53" name="resizeToContentsRightMargin"/>
+          <Option type="QString" value="3.53" name="resizeToContentsTopMargin"/>
+          <Option type="QString" value="false" name="singleFile"/>
         </Option>
       </customproperties>
-      <Atlas hideCoverage="0" pageNameExpression="&quot;position&quot;" sortFeatures="1" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/marshal_positions.shp|layername=marshal_positions" filenamePattern="&quot;csv_club&quot;||'_marshal_map_'||&quot;position&quot;" coverageLayerName="marshal_positions" sortAscending="1" filterFeatures="0" coverageLayer="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" sortKey="position" coverageLayerProvider="ogr" enabled="1"/>
+      <Atlas sortKey="position" sortAscending="1" filenamePattern="&quot;csv_club&quot;||'_marshal_map_'||&quot;position&quot;" coverageLayer="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" filterFeatures="0" hideCoverage="0" enabled="1" coverageLayerProvider="ogr" pageNameExpression="&quot;position&quot;" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/marshal_positions.shp|layername=marshal_positions" coverageLayerName="marshal_positions" sortFeatures="1"/>
     </Layout>
-    <Layout name="Start &amp; Finish Backgrounds" printResolution="300" worldFileMap="" units="mm">
-      <Snapper snapToItems="1" snapToGuides="1" tolerance="5" snapToGrid="0"/>
-      <Grid resUnits="mm" offsetUnits="mm" offsetY="0" offsetX="0" resolution="10"/>
+    <Layout units="mm" printResolution="300" worldFileMap="" name="Start &amp; Finish Backgrounds">
+      <Snapper snapToGuides="1" tolerance="5" snapToGrid="0" snapToItems="1"/>
+      <Grid resolution="10" offsetY="0" offsetX="0" offsetUnits="mm" resUnits="mm"/>
       <PageCollection>
-        <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+        <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="255,255,255,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="no" type="QString" name="outline_style"/>
-              <Option value="0.26" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+              <Option type="QString" value="255,255,255,255" name="color"/>
+              <Option type="QString" value="miter" name="joinstyle"/>
+              <Option type="QString" value="0,0" name="offset"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+              <Option type="QString" value="MM" name="offset_unit"/>
+              <Option type="QString" value="0,0,0,255" name="outline_color"/>
+              <Option type="QString" value="no" name="outline_style"/>
+              <Option type="QString" value="0.26" name="outline_width"/>
+              <Option type="QString" value="MM" name="outline_width_unit"/>
+              <Option type="QString" value="solid" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
@@ -28356,49 +28446,49 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem outlineWidthM="0.3,mm" groupUuid="" position="0,0,mm" positionLock="false" templateUuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" uuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" type="65638" blendMode="0" size="297,210,mm" opacity="1" visibility="1" referencePoint="0" id="" frame="false" zValue="0" frameJoinStyle="miter" positionOnPage="0,0,mm" background="true" excludeFromExports="0" itemRotation="0">
-          <FrameColor red="0" green="0" blue="0" alpha="255"/>
-          <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+        <LayoutItem referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" groupUuid="" positionOnPage="0,0,mm" positionLock="false" frameJoinStyle="miter" frame="false" type="65638" outlineWidthM="0.3,mm" templateUuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" background="true" size="297,210,mm" zValue="0" uuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" opacity="1" position="0,0,mm" excludeFromExports="0">
+          <FrameColor alpha="255" red="0" blue="0" green="0"/>
+          <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="255,255,255,255" type="QString" name="color"/>
-                <Option value="miter" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="255,255,255,255" name="color"/>
+                <Option type="QString" value="miter" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                <Option type="QString" value="no" name="outline_style"/>
+                <Option type="QString" value="0.26" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -28413,9 +28503,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -28423,21 +28513,21 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem outlineWidthM="0.3,mm" groupUuid="" position="286.027,2,mm" anchorPoint="0" positionLock="true" svgFillColor="255,255,255,255" templateUuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" uuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" type="65640" blendMode="0" size="9.45865,11,mm" opacity="1" visibility="1" svgBorderColor="0,0,0,255" northMode="0" northOffset="0" referencePoint="0" id="" frame="false" zValue="4" mode="0" frameJoinStyle="miter" resizeMode="0" positionOnPage="286.027,2,mm" file="arrows/NorthArrow_11.svg" svgBorderWidth="0.2" pictureRotation="330" background="false" pictureHeight="7.97477" pictureWidth="6.31767" excludeFromExports="0" itemRotation="0" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" svgBorderWidth="0.2" pictureHeight="7.97477" groupUuid="" positionOnPage="286.027,2,mm" positionLock="true" frameJoinStyle="miter" mode="0" frame="false" type="65640" outlineWidthM="0.3,mm" resizeMode="0" file="arrows/NorthArrow_11.svg" northOffset="0" templateUuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" background="false" svgFillColor="255,255,255,255" pictureRotation="330" size="9.45865,11,mm" zValue="4" uuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" svgBorderColor="0,0,0,255" northMode="0" opacity="1" position="286.027,2,mm" excludeFromExports="0" pictureWidth="6.31767" anchorPoint="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedSource">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -28445,47 +28535,47 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" valign="64" groupUuid="" position="285.027,205.886,mm" positionLock="true" templateUuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" uuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" type="65641" blendMode="0" size="142.543,10.3185,mm" opacity="1" visibility="1" htmlState="0" referencePoint="0" marginX="1" id="" halign="1" frame="false" zValue="3" labelText="[%upper( &quot;area&quot; )%]" frameJoinStyle="miter" positionOnPage="285.027,205.886,mm" background="false" marginY="1" excludeFromExports="0" itemRotation="270">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem marginY="1" referencePoint="0" blendMode="0" itemRotation="270" id="" visibility="1" htmlState="0" groupUuid="" positionOnPage="285.027,205.886,mm" positionLock="true" frameJoinStyle="miter" frame="false" type="65641" outlineWidthM="0.3,mm" templateUuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" background="false" size="142.543,10.3185,mm" labelText="[%upper( &quot;area&quot; )%]" zValue="3" uuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" opacity="1" position="285.027,205.886,mm" marginX="1" halign="1" valign="64" excludeFromExports="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="50" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="1" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="12" namedStyle="" forcedItalic="0" fontSizeUnit="Point" allowHtml="0">
+        <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="" fontUnderline="0" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" fontWeight="50" fontStrikeout="0" fontItalic="0" fontSize="12" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferNoFill="1" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="1.5"/>
-          <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeBorderWidth="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <text-buffer bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
+            <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -28500,65 +28590,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem lineJoinStyle="miter" outlineWidthM="0.3,mm" numUnitsPerSegment="100" frameJoinStyle="miter" excludeFromExports="0" height="3" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" background="false" unitLabel="m" maxBarWidth="150" lineCapStyle="square" size="145.54,16.2165,mm" numSegments="4" outlineWidth="0.3" type="65646" boxContentSpace="1" id="" labelVerticalPlacement="0" positionLock="true" blendMode="0" positionOnPage="7,189.669,mm" templateUuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" frame="false" numMapUnitsPerScaleBarUnit="1" opacity="1" uuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" labelHorizontalPlacement="0" style="Single Box" referencePoint="0" visibility="1" labelBarSpace="3" itemRotation="0" segmentMillimeters="26.3519" segmentSizeMode="1" minBarWidth="50" numSegmentsLeft="2" numSubdivisions="1" groupUuid="" position="7,189.669,mm" unitType="meters" subdivisionsHeight="1.5" alignment="0" zValue="2">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" alignment="0" size="145.54,16.2165,mm" unitLabel="m" templateUuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" blendMode="0" labelBarSpace="3" position="7,189.669,mm" groupUuid="" referencePoint="0" unitType="meters" lineCapStyle="square" itemRotation="0" maxBarWidth="150" numMapUnitsPerScaleBarUnit="1" subdivisionsHeight="1.5" outlineWidthM="0.3,mm" labelHorizontalPlacement="0" outlineWidth="0.3" background="false" numSubdivisions="1" visibility="1" numSegments="4" segmentSizeMode="1" numUnitsPerSegment="100" lineJoinStyle="miter" positionLock="true" zValue="2" id="" labelVerticalPlacement="0" positionOnPage="7,189.669,mm" excludeFromExports="0" style="Single Box" segmentMillimeters="26.3519" type="65646" minBarWidth="50" uuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" opacity="1" boxContentSpace="1" frame="false" frameJoinStyle="miter" numSegmentsLeft="2" height="3">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="50" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="1" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="12" namedStyle="" forcedItalic="0" fontSizeUnit="Point" allowHtml="0">
+        <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="" fontUnderline="0" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" fontWeight="50" fontStrikeout="0" fontItalic="0" fontSize="12" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferNoFill="1" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="0"/>
-          <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeBorderWidth="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <text-buffer bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
+            <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -28573,75 +28663,75 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
-        <strokeColor red="0" green="0" blue="0" alpha="255"/>
+        <strokeColor alpha="255" red="0" blue="0" green="0"/>
         <numericFormat id="basic">
           <Option type="Map">
-            <Option value="" type="QChar" name="decimal_separator"/>
-            <Option value="6" type="int" name="decimals"/>
-            <Option value="0" type="int" name="rounding_type"/>
-            <Option value="false" type="bool" name="show_plus"/>
-            <Option value="true" type="bool" name="show_thousand_separator"/>
-            <Option value="false" type="bool" name="show_trailing_zeros"/>
-            <Option value="" type="QChar" name="thousand_separator"/>
+            <Option type="QChar" value="" name="decimal_separator"/>
+            <Option type="int" value="6" name="decimals"/>
+            <Option type="int" value="0" name="rounding_type"/>
+            <Option type="bool" value="false" name="show_plus"/>
+            <Option type="bool" value="true" name="show_thousand_separator"/>
+            <Option type="bool" value="false" name="show_trailing_zeros"/>
+            <Option type="QChar" value="" name="thousand_separator"/>
           </Option>
         </numericFormat>
-        <fillColor red="0" green="0" blue="0" alpha="255"/>
-        <fillColor2 red="255" green="255" blue="255" alpha="255"/>
+        <fillColor alpha="255" red="0" blue="0" green="0"/>
+        <fillColor2 alpha="255" red="255" blue="255" green="255"/>
         <lineSymbol>
-          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="miter" type="QString" name="joinstyle"/>
-                <Option value="0,0,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.3" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="miter" name="joinstyle"/>
+                <Option type="QString" value="0,0,0,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.3" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -28672,52 +28762,52 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </lineSymbol>
         <divisionLineSymbol>
-          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="miter" type="QString" name="joinstyle"/>
-                <Option value="0,0,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.3" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="miter" name="joinstyle"/>
+                <Option type="QString" value="0,0,0,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.3" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -28748,52 +28838,52 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </divisionLineSymbol>
         <subdivisionLineSymbol>
-          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="miter" type="QString" name="joinstyle"/>
-                <Option value="0,0,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.3" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="miter" name="joinstyle"/>
+                <Option type="QString" value="0,0,0,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.3" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -28824,36 +28914,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </subdivisionLineSymbol>
         <fillSymbol1>
-          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="0,0,0,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="0,0,0,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                <Option type="QString" value="no" name="outline_style"/>
+                <Option type="QString" value="0.26" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="0,0,0,255"/>
@@ -28868,36 +28958,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol1>
         <fillSymbol2>
-          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="255,255,255,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="255,255,255,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                <Option type="QString" value="no" name="outline_style"/>
+                <Option type="QString" value="0.26" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -28912,87 +29002,87 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol2>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" groupUuid="" position="7,5.5,mm" positionLock="true" templateUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" uuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" type="65639" blendMode="0" followPresetName="Start/Finish" keepLayerSet="false" size="278.027,180.318,mm" opacity="1" visibility="1" referencePoint="0" id="" frame="false" followPreset="true" zValue="1" frameJoinStyle="miter" labelMargin="0,mm" positionOnPage="7,5.5,mm" mapRotation="330" background="false" excludeFromExports="0" itemRotation="0" drawCanvasItems="false" mapFlags="0" isTemporal="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" drawCanvasItems="false" mapRotation="330" mapFlags="0" groupUuid="" positionOnPage="7,5.5,mm" positionLock="true" frameJoinStyle="miter" followPresetName="Start/Finish" frame="false" type="65639" outlineWidthM="0.3,mm" labelMargin="0,mm" templateUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" background="false" size="278.027,180.318,mm" zValue="1" uuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" opacity="1" position="7,5.5,mm" keepLayerSet="false" excludeFromExports="0" isTemporal="0" followPreset="true">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedMapRotation">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="rotation" type="QString" name="field"/>
-                  <Option value="2" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="rotation" name="field"/>
+                  <Option type="int" value="2" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapScale">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="id" type="QString" name="field"/>
-                  <Option value="2" type="int" name="type"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="id" name="field"/>
+                  <Option type="int" value="2" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedRotation">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="angle" type="QString" name="field"/>
-                  <Option value="2" type="int" name="type"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="angle" name="field"/>
+                  <Option type="int" value="2" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.40843143571575169" ymax="-33.89880140828828559" ymin="-33.90494830469008747" xmax="18.41790915398017958"/>
+        <Extent ymax="-33.89880140828828559" xmin="18.40843143571575169" ymin="-33.90494830469008747" xmax="18.41790915398017958"/>
         <LayerSet/>
-        <ComposerMapGrid show="0" rotatedTicksEnabled="0" gridFrameStyle="0" crossLength="3" gridFrameMargin="0" leftFrameDivisions="0" bottomFrameDivisions="0" gridFramePenThickness="0.5" topAnnotationDisplay="3" topAnnotationPosition="1" rotatedTicksMinimumAngle="0" name="Grid 1" showAnnotation="0" rotatedAnnotationsEnabled="0" rotatedTicksLengthMode="0" annotationExpression="" intervalX="5" bottomAnnotationPosition="1" rightAnnotationDisplay="3" rotatedAnnotationsMinimumAngle="0" annotationPrecision="3" frameFillColor1="255,255,255,255" blendMode="0" offsetY="0" gridFrameWidth="2" leftAnnotationDisplay="3" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" rotatedAnnotationsMarginToCorner="0" topFrameDivisions="0" topAnnotationDirection="0" rightAnnotationPosition="1" rotatedTicksMarginToCorner="0" gridStyle="0" minimumIntervalWidth="50" intervalY="5" unit="1" maximumIntervalWidth="100" gridFrameSideFlags="15" frameAnnotationDistance="1" frameFillColor2="0,0,0,255" rightAnnotationDirection="0" position="3" bottomAnnotationDisplay="3" leftAnnotationPosition="1" rotatedAnnotationsLengthMode="0" annotationFormat="4" gridFramePenColor="0,0,0,255" leftAnnotationDirection="0" rightFrameDivisions="0" bottomAnnotationDirection="0" offsetX="0">
+        <ComposerMapGrid bottomAnnotationPosition="1" frameFillColor2="0,0,0,255" blendMode="0" bottomAnnotationDisplay="3" name="Grid 1" frameFillColor1="255,255,255,255" position="3" bottomFrameDivisions="0" topAnnotationPosition="1" crossLength="3" leftAnnotationDisplay="3" intervalY="5" rotatedAnnotationsMarginToCorner="0" gridFrameStyle="0" annotationFormat="4" topAnnotationDirection="0" leftFrameDivisions="0" topFrameDivisions="0" annotationPrecision="3" rotatedTicksMinimumAngle="0" rightFrameDivisions="0" maximumIntervalWidth="100" unit="1" rotatedTicksEnabled="0" topAnnotationDisplay="3" leftAnnotationPosition="1" show="0" rotatedTicksMarginToCorner="0" rotatedTicksLengthMode="0" gridStyle="0" rotatedAnnotationsMinimumAngle="0" minimumIntervalWidth="50" bottomAnnotationDirection="0" annotationExpression="" intervalX="5" offsetY="0" offsetX="0" gridFramePenColor="0,0,0,255" gridFrameMargin="0" gridFrameWidth="2" rightAnnotationDisplay="3" rotatedAnnotationsEnabled="0" leftAnnotationDirection="0" rightAnnotationDirection="0" gridFrameSideFlags="15" gridFramePenThickness="0.5" showAnnotation="0" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" rightAnnotationPosition="1" frameAnnotationDistance="1" rotatedAnnotationsLengthMode="0">
           <lineStyle>
-            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="195,195,195,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="195,195,195,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -29023,44 +29113,44 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+              <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="angle"/>
-                  <Option value="square" type="QString" name="cap_style"/>
-                  <Option value="0,0,0,255" type="QString" name="color"/>
-                  <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="circle" type="QString" name="name"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                  <Option value="solid" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="diameter" type="QString" name="scale_method"/>
-                  <Option value="2" type="QString" name="size"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="size_unit"/>
-                  <Option value="1" type="QString" name="vertical_anchor_point"/>
+                  <Option type="QString" value="0" name="angle"/>
+                  <Option type="QString" value="square" name="cap_style"/>
+                  <Option type="QString" value="0,0,0,255" name="color"/>
+                  <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="circle" name="name"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                  <Option type="QString" value="solid" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="diameter" name="scale_method"/>
+                  <Option type="QString" value="2" name="size"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="size_unit"/>
+                  <Option type="QString" value="1" name="vertical_anchor_point"/>
                 </Option>
                 <prop k="angle" v="0"/>
                 <prop k="cap_style" v="square"/>
@@ -29083,9 +29173,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -29102,32 +29192,32 @@ def my_form_open(dialog, layer, feature):
             <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
             <geographicflag>false</geographicflag>
           </spatialrefsys>
-          <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="50" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="1" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="10" namedStyle="" forcedItalic="0" fontSizeUnit="Point" allowHtml="0">
+          <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="" fontUnderline="0" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" fontWeight="50" fontStrikeout="0" fontItalic="0" fontSize="10" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" textOrientation="horizontal">
             <families/>
-            <text-buffer bufferNoFill="1" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="1.5"/>
-            <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeBorderWidth="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-              <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <text-buffer bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+            <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskType="0"/>
+            <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
+              <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                    <Option value="255,255,255,255" type="QString" name="color"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                    <Option value="no" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="solid" type="QString" name="style"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                    <Option type="QString" value="255,255,255,255" name="color"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                    <Option type="QString" value="no" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="solid" name="style"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -29142,29 +29232,29 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+            <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -29172,65 +29262,65 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap margin="0.05" atlasDriven="1" scalingMode="2"/>
+        <AtlasMap margin="0.05" scalingMode="2" atlasDriven="1"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" enabled="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clipSource="" enabled="0" clippingType="0"/>
+        <itemClippingSettings clipSource="" forceLabelsInside="0" clippingType="0" enabled="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" type="QString" name="atlasRasterFormat"/>
-          <Option value="0" type="QString" name="forceVector"/>
-          <Option value="true" type="QString" name="imageAntialias"/>
-          <Option value="0" type="QString" name="imageCropMarginBottom"/>
-          <Option value="0" type="QString" name="imageCropMarginLeft"/>
-          <Option value="0" type="QString" name="imageCropMarginRight"/>
-          <Option value="0" type="QString" name="imageCropMarginTop"/>
-          <Option value="false" type="QString" name="imageCropToContents"/>
-          <Option value="0" type="QString" name="pdfDisableRasterTiles"/>
-          <Option value="1" type="QString" name="pdfIncludeMetadata"/>
-          <Option value="0" type="QString" name="pdfTextFormat"/>
-          <Option value="true" type="QString" name="singleFile"/>
-          <Option value="0" type="QString" name="svgCropMarginBottom"/>
-          <Option value="0" type="QString" name="svgCropMarginLeft"/>
-          <Option value="0" type="QString" name="svgCropMarginRight"/>
-          <Option value="0" type="QString" name="svgCropMarginTop"/>
-          <Option value="true" type="QString" name="svgCropToContents"/>
-          <Option value="0" type="QString" name="svgDisableRasterTiles"/>
-          <Option value="false" type="QString" name="svgGroupLayers"/>
-          <Option value="1" type="QString" name="svgIncludeMetadata"/>
-          <Option value="0" type="QString" name="svgTextFormat"/>
+          <Option type="QString" value="png" name="atlasRasterFormat"/>
+          <Option type="QString" value="0" name="forceVector"/>
+          <Option type="QString" value="true" name="imageAntialias"/>
+          <Option type="QString" value="0" name="imageCropMarginBottom"/>
+          <Option type="QString" value="0" name="imageCropMarginLeft"/>
+          <Option type="QString" value="0" name="imageCropMarginRight"/>
+          <Option type="QString" value="0" name="imageCropMarginTop"/>
+          <Option type="QString" value="false" name="imageCropToContents"/>
+          <Option type="QString" value="0" name="pdfDisableRasterTiles"/>
+          <Option type="QString" value="1" name="pdfIncludeMetadata"/>
+          <Option type="QString" value="0" name="pdfTextFormat"/>
+          <Option type="QString" value="true" name="singleFile"/>
+          <Option type="QString" value="0" name="svgCropMarginBottom"/>
+          <Option type="QString" value="0" name="svgCropMarginLeft"/>
+          <Option type="QString" value="0" name="svgCropMarginRight"/>
+          <Option type="QString" value="0" name="svgCropMarginTop"/>
+          <Option type="QString" value="true" name="svgCropToContents"/>
+          <Option type="QString" value="0" name="svgDisableRasterTiles"/>
+          <Option type="QString" value="false" name="svgGroupLayers"/>
+          <Option type="QString" value="1" name="svgIncludeMetadata"/>
+          <Option type="QString" value="0" name="svgTextFormat"/>
         </Option>
       </customproperties>
-      <Atlas hideCoverage="1" pageNameExpression="&quot;area&quot;" sortFeatures="1" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/start_finish_area.shp" filenamePattern="'output_'||@atlas_featurenumber" coverageLayerName="start_finish_area" sortAscending="1" filterFeatures="0" coverageLayer="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" sortKey="area" coverageLayerProvider="ogr" enabled="1"/>
+      <Atlas sortKey="area" sortAscending="1" filenamePattern="'output_'||@atlas_featurenumber" coverageLayer="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" filterFeatures="0" hideCoverage="1" enabled="1" coverageLayerProvider="ogr" pageNameExpression="&quot;area&quot;" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/start_finish_area.shp" coverageLayerName="start_finish_area" sortFeatures="1"/>
     </Layout>
-    <Layout name="Fencing" printResolution="300" worldFileMap="" units="mm">
-      <Snapper snapToItems="1" snapToGuides="1" tolerance="5" snapToGrid="0"/>
-      <Grid resUnits="mm" offsetUnits="mm" offsetY="0" offsetX="0" resolution="10"/>
+    <Layout units="mm" printResolution="300" worldFileMap="" name="Fencing">
+      <Snapper snapToGuides="1" tolerance="5" snapToGrid="0" snapToItems="1"/>
+      <Grid resolution="10" offsetY="0" offsetX="0" offsetUnits="mm" resUnits="mm"/>
       <PageCollection>
-        <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+        <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="255,255,255,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="no" type="QString" name="outline_style"/>
-              <Option value="0.26" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+              <Option type="QString" value="255,255,255,255" name="color"/>
+              <Option type="QString" value="miter" name="joinstyle"/>
+              <Option type="QString" value="0,0" name="offset"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+              <Option type="QString" value="MM" name="offset_unit"/>
+              <Option type="QString" value="0,0,0,255" name="outline_color"/>
+              <Option type="QString" value="no" name="outline_style"/>
+              <Option type="QString" value="0.26" name="outline_width"/>
+              <Option type="QString" value="MM" name="outline_width_unit"/>
+              <Option type="QString" value="solid" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
@@ -29245,49 +29335,49 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem outlineWidthM="0.3,mm" groupUuid="" position="0,0,mm" positionLock="false" templateUuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" uuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" type="65638" blendMode="0" size="297,210,mm" opacity="1" visibility="1" referencePoint="0" id="" frame="false" zValue="0" frameJoinStyle="miter" positionOnPage="0,0,mm" background="true" excludeFromExports="0" itemRotation="0">
-          <FrameColor red="0" green="0" blue="0" alpha="255"/>
-          <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+        <LayoutItem referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" groupUuid="" positionOnPage="0,0,mm" positionLock="false" frameJoinStyle="miter" frame="false" type="65638" outlineWidthM="0.3,mm" templateUuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" background="true" size="297,210,mm" zValue="0" uuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" opacity="1" position="0,0,mm" excludeFromExports="0">
+          <FrameColor alpha="255" red="0" blue="0" green="0"/>
+          <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="255,255,255,255" type="QString" name="color"/>
-                <Option value="miter" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="255,255,255,255" name="color"/>
+                <Option type="QString" value="miter" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                <Option type="QString" value="no" name="outline_style"/>
+                <Option type="QString" value="0.26" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -29302,9 +29392,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -29312,47 +29402,47 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem outlineWidthM="0.3,mm" valign="64" groupUuid="" position="6.76779,190.27,mm" positionLock="true" templateUuid="{00558977-061b-4811-9651-3f50eed14a4c}" uuid="{00558977-061b-4811-9651-3f50eed14a4c}" type="65641" blendMode="0" size="148.46,7.36972,mm" opacity="1" visibility="1" htmlState="0" referencePoint="0" marginX="1" id="" halign="1" frame="false" zValue="11" labelText="FENCING: [% &quot;name&quot; %]" frameJoinStyle="miter" positionOnPage="6.76779,190.27,mm" background="false" marginY="1" excludeFromExports="0" itemRotation="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem marginY="1" referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" htmlState="0" groupUuid="" positionOnPage="6.76779,190.27,mm" positionLock="true" frameJoinStyle="miter" frame="false" type="65641" outlineWidthM="0.3,mm" templateUuid="{00558977-061b-4811-9651-3f50eed14a4c}" background="false" size="148.46,7.36972,mm" labelText="FENCING: [% &quot;name&quot; %]" zValue="11" uuid="{00558977-061b-4811-9651-3f50eed14a4c}" opacity="1" position="6.76779,190.27,mm" marginX="1" halign="1" valign="64" excludeFromExports="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="63" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="1" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="12" namedStyle="" forcedItalic="0" fontSizeUnit="Point" allowHtml="0">
+        <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="" fontUnderline="0" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" fontWeight="63" fontStrikeout="0" fontItalic="0" fontSize="12" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferNoFill="1" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="1.5"/>
-          <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeBorderWidth="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <text-buffer bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
+            <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -29367,65 +29457,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" valign="32" groupUuid="" position="211.295,197.64,mm" positionLock="true" templateUuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" uuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" type="65641" blendMode="0" size="27.7839,7.51682,mm" opacity="1" visibility="1" htmlState="0" referencePoint="0" marginX="1" id="" halign="2" frame="false" zValue="10" labelText="REVISION 1.0" frameJoinStyle="miter" positionOnPage="211.295,197.64,mm" background="false" marginY="1" excludeFromExports="0" itemRotation="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem marginY="1" referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" htmlState="0" groupUuid="" positionOnPage="211.295,197.64,mm" positionLock="true" frameJoinStyle="miter" frame="false" type="65641" outlineWidthM="0.3,mm" templateUuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" background="false" size="27.7839,7.51682,mm" labelText="REVISION 1.0" zValue="10" uuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" opacity="1" position="211.295,197.64,mm" marginX="1" halign="2" valign="32" excludeFromExports="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="50" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="1" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="12" namedStyle="" forcedItalic="0" fontSizeUnit="Point" allowHtml="0">
+        <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="" fontUnderline="0" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" fontWeight="50" fontStrikeout="0" fontItalic="0" fontSize="12" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferNoFill="1" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="1.5"/>
-          <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeBorderWidth="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <text-buffer bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
+            <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -29440,65 +29530,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" valign="32" groupUuid="" position="115.637,198.083,mm" positionLock="true" templateUuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" uuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" type="65641" blendMode="0" size="67.0856,7.80192,mm" opacity="1" visibility="1" htmlState="0" referencePoint="0" marginX="1" id="" halign="1" frame="false" zValue="9" labelText="Total cones: [% round(&quot;cone_len&quot;, 0) %]m" frameJoinStyle="miter" positionOnPage="115.637,198.083,mm" background="false" marginY="1" excludeFromExports="0" itemRotation="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem marginY="1" referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" htmlState="0" groupUuid="" positionOnPage="115.637,198.083,mm" positionLock="true" frameJoinStyle="miter" frame="false" type="65641" outlineWidthM="0.3,mm" templateUuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" background="false" size="67.0856,7.80192,mm" labelText="Total cones: [% round(&quot;cone_len&quot;, 0) %]m" zValue="9" uuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" opacity="1" position="115.637,198.083,mm" marginX="1" halign="1" valign="32" excludeFromExports="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="50" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="1" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="12" namedStyle="" forcedItalic="0" fontSizeUnit="Point" allowHtml="0">
+        <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="" fontUnderline="0" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" fontWeight="50" fontStrikeout="0" fontItalic="0" fontSize="12" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferNoFill="1" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="1.5"/>
-          <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeBorderWidth="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <text-buffer bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
+            <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -29513,65 +29603,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" valign="32" groupUuid="" position="59.5581,198.083,mm" positionLock="true" templateUuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" uuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" type="65641" blendMode="0" size="53.0017,7.80192,mm" opacity="1" visibility="1" htmlState="0" referencePoint="0" marginX="1" id="" halign="1" frame="false" zValue="8" labelText="Total fencing: [% round(&quot;fence_len&quot;, 0) %]m" frameJoinStyle="miter" positionOnPage="59.5581,198.083,mm" background="false" marginY="1" excludeFromExports="0" itemRotation="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem marginY="1" referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" htmlState="0" groupUuid="" positionOnPage="59.5581,198.083,mm" positionLock="true" frameJoinStyle="miter" frame="false" type="65641" outlineWidthM="0.3,mm" templateUuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" background="false" size="53.0017,7.80192,mm" labelText="Total fencing: [% round(&quot;fence_len&quot;, 0) %]m" zValue="8" uuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" opacity="1" position="59.5581,198.083,mm" marginX="1" halign="1" valign="32" excludeFromExports="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="50" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="1" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="12" namedStyle="" forcedItalic="0" fontSizeUnit="Point" allowHtml="0">
+        <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="" fontUnderline="0" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" fontWeight="50" fontStrikeout="0" fontItalic="0" fontSize="12" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferNoFill="1" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="1.5"/>
-          <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeBorderWidth="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <text-buffer bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
+            <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -29586,65 +29676,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" valign="32" groupUuid="" position="6.76779,198.083,mm" positionLock="true" templateUuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" uuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" type="65641" blendMode="0" size="52.7903,7.80192,mm" opacity="1" visibility="1" htmlState="0" referencePoint="0" marginX="1" id="" halign="1" frame="false" zValue="7" labelText="Page [% @atlas_featurenumber %]" frameJoinStyle="miter" positionOnPage="6.76779,198.083,mm" background="false" marginY="1" excludeFromExports="0" itemRotation="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem marginY="1" referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" htmlState="0" groupUuid="" positionOnPage="6.76779,198.083,mm" positionLock="true" frameJoinStyle="miter" frame="false" type="65641" outlineWidthM="0.3,mm" templateUuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" background="false" size="52.7903,7.80192,mm" labelText="Page [% @atlas_featurenumber %]" zValue="7" uuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" opacity="1" position="6.76779,198.083,mm" marginX="1" halign="1" valign="32" excludeFromExports="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="50" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="1" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="12" namedStyle="" forcedItalic="0" fontSizeUnit="Point" allowHtml="0">
+        <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="" fontUnderline="0" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" fontWeight="50" fontStrikeout="0" fontItalic="0" fontSize="12" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferNoFill="1" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="1.5"/>
-          <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeBorderWidth="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <text-buffer bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
+            <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -29659,39 +29749,39 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" groupUuid="" position="243.098,175.353,mm" anchorPoint="8" positionLock="true" svgFillColor="255,255,255,255" templateUuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" uuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" type="65640" blendMode="0" size="49.3143,29.8354,mm" opacity="1" visibility="1" svgBorderColor="0,0,0,255" northMode="0" northOffset="0" referencePoint="0" id="" frame="false" zValue="6" mode="1" frameJoinStyle="miter" resizeMode="0" positionOnPage="243.098,175.353,mm" file="../Gun_Run_Logo.png" svgBorderWidth="0.2" pictureRotation="0" background="false" pictureHeight="29.8354" pictureWidth="29.6535" excludeFromExports="0" itemRotation="0" mapUuid="">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" mapUuid="" svgBorderWidth="0.2" pictureHeight="29.8354" groupUuid="" positionOnPage="243.098,175.353,mm" positionLock="true" frameJoinStyle="miter" mode="1" frame="false" type="65640" outlineWidthM="0.3,mm" resizeMode="0" file="../Gun_Run_Logo.png" northOffset="0" templateUuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" background="false" svgFillColor="255,255,255,255" pictureRotation="0" size="49.3143,29.8354,mm" zValue="6" uuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" svgBorderColor="0,0,0,255" northMode="0" opacity="1" position="243.098,175.353,mm" excludeFromExports="0" pictureWidth="29.6535" anchorPoint="8">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedSource">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -29699,47 +29789,47 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" valign="64" groupUuid="" position="182.723,190.271,mm" positionLock="true" templateUuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" uuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" type="65641" blendMode="0" size="56.3557,7.36902,mm" opacity="1" visibility="1" htmlState="0" referencePoint="0" marginX="1" id="" halign="2" frame="false" zValue="5" labelText="Sunday, 20 September 2020" frameJoinStyle="miter" positionOnPage="182.723,190.271,mm" background="false" marginY="1" excludeFromExports="0" itemRotation="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem marginY="1" referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" htmlState="0" groupUuid="" positionOnPage="182.723,190.271,mm" positionLock="true" frameJoinStyle="miter" frame="false" type="65641" outlineWidthM="0.3,mm" templateUuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" background="false" size="56.3557,7.36902,mm" labelText="Sunday, 20 September 2020" zValue="5" uuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" opacity="1" position="182.723,190.271,mm" marginX="1" halign="2" valign="64" excludeFromExports="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="50" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="1" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="12" namedStyle="" forcedItalic="0" fontSizeUnit="Point" allowHtml="0">
+        <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="" fontUnderline="0" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" fontWeight="50" fontStrikeout="0" fontItalic="0" fontSize="12" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferNoFill="1" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="1.5"/>
-          <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeBorderWidth="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <text-buffer bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
+            <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -29754,60 +29844,60 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" groupUuid="" position="6.91779,197.79,mm" positionLock="true" templateUuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" uuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" type="65643" blendMode="0" size="232.01,0.14328,mm" opacity="1" visibility="1" referencePoint="0" id="" frame="false" zValue="4" shapeType="1" cornerRadiusMeasure="0,mm" frameJoinStyle="miter" positionOnPage="6.91779,197.79,mm" background="false" excludeFromExports="0" itemRotation="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" groupUuid="" positionOnPage="6.91779,197.79,mm" positionLock="true" frameJoinStyle="miter" frame="false" type="65643" outlineWidthM="0.3,mm" shapeType="1" cornerRadiusMeasure="0,mm" templateUuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" background="false" size="232.01,0.14328,mm" zValue="4" uuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" opacity="1" position="6.91779,197.79,mm" excludeFromExports="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+        <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="0,0,0,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="solid" type="QString" name="outline_style"/>
-              <Option value="0.3" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+              <Option type="QString" value="0,0,0,255" name="color"/>
+              <Option type="QString" value="miter" name="joinstyle"/>
+              <Option type="QString" value="0,0" name="offset"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+              <Option type="QString" value="MM" name="offset_unit"/>
+              <Option type="QString" value="0,0,0,255" name="outline_color"/>
+              <Option type="QString" value="solid" name="outline_style"/>
+              <Option type="QString" value="0.3" name="outline_width"/>
+              <Option type="QString" value="MM" name="outline_width_unit"/>
+              <Option type="QString" value="solid" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="0,0,0,255"/>
@@ -29822,55 +29912,55 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem lineJoinStyle="round" outlineWidthM="0.3,mm" numUnitsPerSegment="10" frameJoinStyle="miter" excludeFromExports="0" height="2" mapUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" background="false" unitLabel="m" maxBarWidth="100" lineCapStyle="square" size="95.0404,15.8378,mm" numSegments="2" outlineWidth="0.2" type="65646" boxContentSpace="0.2" id="" labelVerticalPlacement="0" positionLock="true" blendMode="0" positionOnPage="6.76779,2.8482,mm" templateUuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" frame="false" numMapUnitsPerScaleBarUnit="1" opacity="1" uuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" labelHorizontalPlacement="0" style="Double Box" referencePoint="0" visibility="1" labelBarSpace="1" itemRotation="0" segmentMillimeters="28.4264" segmentSizeMode="1" minBarWidth="25" numSegmentsLeft="2" numSubdivisions="1" groupUuid="" position="6.76779,2.8482,mm" unitType="meters" subdivisionsHeight="1.5" alignment="0" zValue="3">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem mapUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" alignment="0" size="95.0404,15.8378,mm" unitLabel="m" templateUuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" blendMode="0" labelBarSpace="1" position="6.76779,2.8482,mm" groupUuid="" referencePoint="0" unitType="meters" lineCapStyle="square" itemRotation="0" maxBarWidth="100" numMapUnitsPerScaleBarUnit="1" subdivisionsHeight="1.5" outlineWidthM="0.3,mm" labelHorizontalPlacement="0" outlineWidth="0.2" background="false" numSubdivisions="1" visibility="1" numSegments="2" segmentSizeMode="1" numUnitsPerSegment="10" lineJoinStyle="round" positionLock="true" zValue="3" id="" labelVerticalPlacement="0" positionOnPage="6.76779,2.8482,mm" excludeFromExports="0" style="Double Box" segmentMillimeters="28.4264" type="65646" minBarWidth="25" uuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" opacity="1" boxContentSpace="0.2" frame="false" frameJoinStyle="miter" numSegmentsLeft="2" height="2">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="50" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="1" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="12" namedStyle="" forcedItalic="0" fontSizeUnit="Point" allowHtml="0">
+        <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="" fontUnderline="0" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" fontWeight="50" fontStrikeout="0" fontItalic="0" fontSize="12" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferNoFill="1" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="0"/>
-          <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeBorderWidth="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <text-buffer bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
+            <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -29885,75 +29975,75 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
-        <strokeColor red="0" green="0" blue="0" alpha="255"/>
+        <strokeColor alpha="255" red="0" blue="0" green="0"/>
         <numericFormat id="basic">
           <Option type="Map">
-            <Option value="" type="QChar" name="decimal_separator"/>
-            <Option value="6" type="int" name="decimals"/>
-            <Option value="0" type="int" name="rounding_type"/>
-            <Option value="false" type="bool" name="show_plus"/>
-            <Option value="true" type="bool" name="show_thousand_separator"/>
-            <Option value="false" type="bool" name="show_trailing_zeros"/>
-            <Option value="" type="QChar" name="thousand_separator"/>
+            <Option type="QChar" value="" name="decimal_separator"/>
+            <Option type="int" value="6" name="decimals"/>
+            <Option type="int" value="0" name="rounding_type"/>
+            <Option type="bool" value="false" name="show_plus"/>
+            <Option type="bool" value="true" name="show_thousand_separator"/>
+            <Option type="bool" value="false" name="show_trailing_zeros"/>
+            <Option type="QChar" value="" name="thousand_separator"/>
           </Option>
         </numericFormat>
-        <fillColor red="0" green="0" blue="0" alpha="255"/>
-        <fillColor2 red="255" green="255" blue="255" alpha="255"/>
+        <fillColor alpha="255" red="0" blue="0" green="0"/>
+        <fillColor2 alpha="255" red="255" blue="255" green="255"/>
         <lineSymbol>
-          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="round" type="QString" name="joinstyle"/>
-                <Option value="0,0,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.2" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="round" name="joinstyle"/>
+                <Option type="QString" value="0,0,0,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.2" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -29984,52 +30074,52 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </lineSymbol>
         <divisionLineSymbol>
-          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="round" type="QString" name="joinstyle"/>
-                <Option value="0,0,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.2" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="round" name="joinstyle"/>
+                <Option type="QString" value="0,0,0,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.2" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -30060,52 +30150,52 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </divisionLineSymbol>
         <subdivisionLineSymbol>
-          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="round" type="QString" name="joinstyle"/>
-                <Option value="0,0,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.2" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="round" name="joinstyle"/>
+                <Option type="QString" value="0,0,0,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.2" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -30136,36 +30226,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </subdivisionLineSymbol>
         <fillSymbol1>
-          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="0,0,0,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="0,0,0,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                <Option type="QString" value="no" name="outline_style"/>
+                <Option type="QString" value="0.26" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="0,0,0,255"/>
@@ -30180,36 +30270,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol1>
         <fillSymbol2>
-          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="255,255,255,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="255,255,255,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                <Option type="QString" value="no" name="outline_style"/>
+                <Option type="QString" value="0.26" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -30224,24 +30314,24 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol2>
       </LayoutItem>
-      <LayoutItem rasterBorderWidth="0" outlineWidthM="0.3,mm" maxSymbolSize="0" rasterBorderColor="0,0,0,255" frameJoinStyle="miter" excludeFromExports="0" title="" columnCount="1" background="true" rasterBorder="1" boxSpace="2" size="38.1563,54.9504,mm" map_uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" legendFilterByAtlas="0" wmsLegendHeight="25" columnSpace="2" type="65642" symbolAlignment="1" id="" positionLock="true" blendMode="0" positionOnPage="256.808,2.9982,mm" splitLayer="0" resizeToContents="0" templateUuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" frame="true" opacity="1" uuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" minSymbolSize="0" fontColor="#000000" lineSpacing="1" referencePoint="0" visibility="1" wrapChar="" itemRotation="0" symbolWidth="7" wmsLegendWidth="50" groupUuid="" position="256.808,2.9982,mm" symbolHeight="4" equalColumnWidth="1" titleAlignment="1" zValue="2">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem splitLayer="0" size="38.1563,54.9504,mm" legendFilterByAtlas="0" boxSpace="2" templateUuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" blendMode="0" maxSymbolSize="0" position="256.808,2.9982,mm" groupUuid="" wrapChar="" minSymbolSize="0" referencePoint="0" symbolAlignment="1" itemRotation="0" title="" equalColumnWidth="1" resizeToContents="0" wmsLegendHeight="25" columnCount="1" outlineWidthM="0.3,mm" rasterBorder="1" background="true" visibility="1" symbolHeight="4" fontColor="#000000" positionLock="true" zValue="2" titleAlignment="1" lineSpacing="1" columnSpace="2" id="" rasterBorderColor="0,0,0,255" positionOnPage="256.808,2.9982,mm" excludeFromExports="0" rasterBorderWidth="0" type="65642" wmsLegendWidth="50" uuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" opacity="1" frame="true" symbolWidth="7" map_uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" frameJoinStyle="miter">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -30249,52 +30339,52 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style name="title" indent="0" alignment="1">
-            <styleFont bold="1" style="Bold" italic="0" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Bold" underline="0" strikethrough="0"/>
+          <style indent="0" alignment="1" name="title">
+            <styleFont style="Bold" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Bold" strikethrough="0" italic="0" underline="0" bold="1"/>
           </style>
-          <style name="group" indent="0" alignment="1" marginTop="3">
-            <styleFont bold="1" style="Semibold" italic="0" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" underline="0" strikethrough="0"/>
+          <style marginTop="3" indent="0" alignment="1" name="group">
+            <styleFont style="Semibold" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0" italic="0" underline="0" bold="1"/>
           </style>
-          <style name="subgroup" indent="0" alignment="1" marginTop="3">
-            <styleFont bold="1" style="Semibold" italic="0" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" underline="0" strikethrough="0"/>
+          <style marginTop="3" indent="0" alignment="1" name="subgroup">
+            <styleFont style="Semibold" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0" italic="0" underline="0" bold="1"/>
           </style>
-          <style name="symbol" indent="0" alignment="1" marginTop="2.5">
-            <styleFont bold="0" style="" italic="0" description="Myriad Pro,9,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0"/>
+          <style marginTop="2.5" indent="0" alignment="1" name="symbol">
+            <styleFont style="" description="Myriad Pro,9,-1,5,50,0,0,0,0,0" strikethrough="0" italic="0" underline="0" bold="0"/>
           </style>
-          <style marginLeft="2" name="symbolLabel" indent="0" alignment="1" marginTop="2">
-            <styleFont bold="0" style="Regular" italic="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular" underline="0" strikethrough="0"/>
+          <style marginTop="2" marginLeft="2" indent="0" alignment="1" name="symbolLabel">
+            <styleFont style="Regular" description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular" strikethrough="0" italic="0" underline="0" bold="0"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group checked="Qt::Checked" name="Fencing and Cones" groupLayer="" expanded="1">
+          <layer-tree-group expanded="1" groupLayer="" checked="Qt::Checked" name="Fencing and Cones">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer checked="Qt::Checked" legend_exp="" source="./fencing.shp|layername=fencing" name="fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" providerKey="ogr" legend_split_behavior="0" patch_size="0,0" expanded="1">
+            <layer-tree-layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" expanded="1" legend_split_behavior="0" source="./fencing.shp|layername=fencing" legend_exp="" providerKey="ogr" patch_size="0,0" checked="Qt::Checked" name="fencing">
               <customproperties>
                 <Option type="Map">
-                  <Option value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" type="QString" name="expandedLegendNodes"/>
-                  <Option value="" type="QString" name="legend/expressionFilter"/>
-                  <Option value="false" type="QString" name="legend/expressionFilterEnabled"/>
-                  <Option value="1,2,3" type="QString" name="legend/node-order"/>
-                  <Option value="hidden" type="QString" name="legend/title-style"/>
+                  <Option type="QString" value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" name="expandedLegendNodes"/>
+                  <Option type="QString" value="" name="legend/expressionFilter"/>
+                  <Option type="QString" value="false" name="legend/expressionFilterEnabled"/>
+                  <Option type="QString" value="1,2,3" name="legend/node-order"/>
+                  <Option type="QString" value="hidden" name="legend/title-style"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
-          <layer-tree-group checked="Qt::Checked" name="Routes" groupLayer="" expanded="1">
+          <layer-tree-group expanded="1" groupLayer="" checked="Qt::Checked" name="Routes">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer checked="Qt::Checked" legend_exp="" source="./all_routes.shp|layername=all_routes" name="all_routes" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" providerKey="ogr" legend_split_behavior="0" patch_size="0,0" expanded="1">
+            <layer-tree-layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" expanded="1" legend_split_behavior="0" source="./all_routes.shp|layername=all_routes" legend_exp="" providerKey="ogr" patch_size="0,0" checked="Qt::Checked" name="all_routes">
               <customproperties>
                 <Option type="Map">
                   <Option type="invalid" name="expandedLegendNodes"/>
-                  <Option value="1,2,3" type="QString" name="legend/node-order"/>
-                  <Option value="hidden" type="QString" name="legend/title-style"/>
+                  <Option type="QString" value="1,2,3" name="legend/node-order"/>
+                  <Option type="QString" value="hidden" name="legend/title-style"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -30302,44 +30392,44 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" groupUuid="" position="6.76779,9.35102,mm" positionLock="true" templateUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" type="65639" blendMode="0" followPresetName="Fencing" keepLayerSet="false" size="283.418,180.92,mm" opacity="0.9" visibility="1" referencePoint="0" id="" frame="false" followPreset="true" zValue="1" frameJoinStyle="miter" labelMargin="0,mm" positionOnPage="6.76779,9.35102,mm" mapRotation="0" background="false" excludeFromExports="0" itemRotation="0" drawCanvasItems="false" mapFlags="0" isTemporal="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" drawCanvasItems="false" mapRotation="0" mapFlags="0" groupUuid="" positionOnPage="6.76779,9.35102,mm" positionLock="true" frameJoinStyle="miter" followPresetName="Fencing" frame="false" type="65639" outlineWidthM="0.3,mm" labelMargin="0,mm" templateUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" background="false" size="283.418,180.92,mm" zValue="1" uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" opacity="0.9" position="6.76779,9.35102,mm" keepLayerSet="false" excludeFromExports="0" isTemporal="0" followPreset="true">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedMapRotation">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="expression"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="" name="expression"/>
                   <Option type="Map" name="transformer">
                     <Option type="Map" name="d">
-                      <Option value="1" type="double" name="exponent"/>
-                      <Option value="360" type="double" name="maxOutput"/>
-                      <Option value="0" type="double" name="maxValue"/>
-                      <Option value="0" type="double" name="minOutput"/>
-                      <Option value="0" type="double" name="minValue"/>
-                      <Option value="0" type="double" name="nullOutput"/>
+                      <Option type="double" value="1" name="exponent"/>
+                      <Option type="double" value="360" name="maxOutput"/>
+                      <Option type="double" value="0" name="maxValue"/>
+                      <Option type="double" value="0" name="minOutput"/>
+                      <Option type="double" value="0" name="minValue"/>
+                      <Option type="double" value="0" name="nullOutput"/>
                     </Option>
-                    <Option value="0" type="int" name="t"/>
+                    <Option type="int" value="0" name="t"/>
                   </Option>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedRotation">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="angle" type="QString" name="field"/>
-                  <Option value="2" type="int" name="type"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="angle" name="field"/>
+                  <Option type="int" value="2" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.41635400827248503" ymax="-33.90364055490629625" ymin="-33.90421228789515595" xmax="18.4172496509604926"/>
+        <Extent ymax="-33.90364055490629625" xmin="18.41635400827248503" ymin="-33.90421228789515595" xmax="18.4172496509604926"/>
         <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>
@@ -30354,45 +30444,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid show="0" rotatedTicksEnabled="0" gridFrameStyle="0" crossLength="3" gridFrameMargin="0" leftFrameDivisions="0" bottomFrameDivisions="0" gridFramePenThickness="0.5" topAnnotationDisplay="3" topAnnotationPosition="1" rotatedTicksMinimumAngle="0" name="Grid 1" showAnnotation="0" rotatedAnnotationsEnabled="0" rotatedTicksLengthMode="0" annotationExpression="" intervalX="5" bottomAnnotationPosition="1" rightAnnotationDisplay="3" rotatedAnnotationsMinimumAngle="0" annotationPrecision="3" frameFillColor1="255,255,255,255" blendMode="0" offsetY="0" gridFrameWidth="2" leftAnnotationDisplay="3" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" rotatedAnnotationsMarginToCorner="0" topFrameDivisions="0" topAnnotationDirection="0" rightAnnotationPosition="1" rotatedTicksMarginToCorner="0" gridStyle="0" minimumIntervalWidth="50" intervalY="5" unit="1" maximumIntervalWidth="100" gridFrameSideFlags="15" frameAnnotationDistance="1" frameFillColor2="0,0,0,255" rightAnnotationDirection="0" position="3" bottomAnnotationDisplay="3" leftAnnotationPosition="1" rotatedAnnotationsLengthMode="0" annotationFormat="4" gridFramePenColor="0,0,0,255" leftAnnotationDirection="0" rightFrameDivisions="0" bottomAnnotationDirection="0" offsetX="0">
+        <ComposerMapGrid bottomAnnotationPosition="1" frameFillColor2="0,0,0,255" blendMode="0" bottomAnnotationDisplay="3" name="Grid 1" frameFillColor1="255,255,255,255" position="3" bottomFrameDivisions="0" topAnnotationPosition="1" crossLength="3" leftAnnotationDisplay="3" intervalY="5" rotatedAnnotationsMarginToCorner="0" gridFrameStyle="0" annotationFormat="4" topAnnotationDirection="0" leftFrameDivisions="0" topFrameDivisions="0" annotationPrecision="3" rotatedTicksMinimumAngle="0" rightFrameDivisions="0" maximumIntervalWidth="100" unit="1" rotatedTicksEnabled="0" topAnnotationDisplay="3" leftAnnotationPosition="1" show="0" rotatedTicksMarginToCorner="0" rotatedTicksLengthMode="0" gridStyle="0" rotatedAnnotationsMinimumAngle="0" minimumIntervalWidth="50" bottomAnnotationDirection="0" annotationExpression="" intervalX="5" offsetY="0" offsetX="0" gridFramePenColor="0,0,0,255" gridFrameMargin="0" gridFrameWidth="2" rightAnnotationDisplay="3" rotatedAnnotationsEnabled="0" leftAnnotationDirection="0" rightAnnotationDirection="0" gridFrameSideFlags="15" gridFramePenThickness="0.5" showAnnotation="0" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" rightAnnotationPosition="1" frameAnnotationDistance="1" rotatedAnnotationsLengthMode="0">
           <lineStyle>
-            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="195,195,195,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="195,195,195,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -30423,44 +30513,44 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+              <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="angle"/>
-                  <Option value="square" type="QString" name="cap_style"/>
-                  <Option value="0,0,0,255" type="QString" name="color"/>
-                  <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="circle" type="QString" name="name"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                  <Option value="solid" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="diameter" type="QString" name="scale_method"/>
-                  <Option value="2" type="QString" name="size"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="size_unit"/>
-                  <Option value="1" type="QString" name="vertical_anchor_point"/>
+                  <Option type="QString" value="0" name="angle"/>
+                  <Option type="QString" value="square" name="cap_style"/>
+                  <Option type="QString" value="0,0,0,255" name="color"/>
+                  <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="circle" name="name"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                  <Option type="QString" value="solid" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="diameter" name="scale_method"/>
+                  <Option type="QString" value="2" name="size"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="size_unit"/>
+                  <Option type="QString" value="1" name="vertical_anchor_point"/>
                 </Option>
                 <prop k="angle" v="0"/>
                 <prop k="cap_style" v="square"/>
@@ -30483,9 +30573,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -30502,32 +30592,32 @@ def my_form_open(dialog, layer, feature):
             <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
             <geographicflag>false</geographicflag>
           </spatialrefsys>
-          <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="50" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="1" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="10" namedStyle="" forcedItalic="0" fontSizeUnit="Point" allowHtml="0">
+          <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="" fontUnderline="0" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" fontWeight="50" fontStrikeout="0" fontItalic="0" fontSize="10" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" textOrientation="horizontal">
             <families/>
-            <text-buffer bufferNoFill="1" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="1.5"/>
-            <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeBorderWidth="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-              <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <text-buffer bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+            <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskType="0"/>
+            <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
+              <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                    <Option value="255,255,255,255" type="QString" name="color"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                    <Option value="no" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="solid" type="QString" name="style"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                    <Option type="QString" value="255,255,255,255" name="color"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                    <Option type="QString" value="no" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="solid" name="style"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -30542,29 +30632,29 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+            <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -30572,62 +30662,62 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap margin="0.40000000000000002" atlasDriven="1" scalingMode="2"/>
+        <AtlasMap margin="0.40000000000000002" scalingMode="2" atlasDriven="1"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" enabled="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clipSource="" enabled="0" clippingType="0"/>
+        <itemClippingSettings clipSource="" forceLabelsInside="0" clippingType="0" enabled="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" type="QString" name="atlasRasterFormat"/>
-          <Option value="0" type="QString" name="forceVector"/>
-          <Option value="true" type="QString" name="imageAntialias"/>
-          <Option value="0" type="QString" name="imageCropMarginBottom"/>
-          <Option value="0" type="QString" name="imageCropMarginLeft"/>
-          <Option value="0" type="QString" name="imageCropMarginRight"/>
-          <Option value="0" type="QString" name="imageCropMarginTop"/>
-          <Option value="false" type="QString" name="imageCropToContents"/>
-          <Option value="1" type="QString" name="pdfAppendGeoreference"/>
-          <Option value="0" type="QString" name="pdfCreateGeoPdf"/>
-          <Option value="0" type="QString" name="pdfDisableRasterTiles"/>
-          <Option value="0" type="QString" name="pdfExportGeoPdfFeatures"/>
-          <Option value="" type="QString" name="pdfExportThemes"/>
-          <Option value="1" type="QString" name="pdfIncludeMetadata"/>
-          <Option value="0" type="QString" name="pdfOgcBestPracticeFormat"/>
-          <Option value="1" type="QString" name="pdfSimplify"/>
-          <Option value="0" type="QString" name="pdfTextFormat"/>
-          <Option value="true" type="QString" name="rasterize"/>
+          <Option type="QString" value="png" name="atlasRasterFormat"/>
+          <Option type="QString" value="0" name="forceVector"/>
+          <Option type="QString" value="true" name="imageAntialias"/>
+          <Option type="QString" value="0" name="imageCropMarginBottom"/>
+          <Option type="QString" value="0" name="imageCropMarginLeft"/>
+          <Option type="QString" value="0" name="imageCropMarginRight"/>
+          <Option type="QString" value="0" name="imageCropMarginTop"/>
+          <Option type="QString" value="false" name="imageCropToContents"/>
+          <Option type="QString" value="1" name="pdfAppendGeoreference"/>
+          <Option type="QString" value="0" name="pdfCreateGeoPdf"/>
+          <Option type="QString" value="0" name="pdfDisableRasterTiles"/>
+          <Option type="QString" value="0" name="pdfExportGeoPdfFeatures"/>
+          <Option type="QString" value="" name="pdfExportThemes"/>
+          <Option type="QString" value="1" name="pdfIncludeMetadata"/>
+          <Option type="QString" value="0" name="pdfOgcBestPracticeFormat"/>
+          <Option type="QString" value="1" name="pdfSimplify"/>
+          <Option type="QString" value="0" name="pdfTextFormat"/>
+          <Option type="QString" value="true" name="rasterize"/>
         </Option>
       </customproperties>
-      <Atlas hideCoverage="1" pageNameExpression="&quot;name&quot;" sortFeatures="1" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20SUM(cone_len)%20AS%20[cone_len],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22" filenamePattern="'output_'||@atlas_featurenumber" coverageLayerName="fence_groups" sortAscending="1" filterFeatures="0" coverageLayer="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792" sortKey="group" coverageLayerProvider="virtual" enabled="1"/>
+      <Atlas sortKey="group" sortAscending="1" filenamePattern="'output_'||@atlas_featurenumber" coverageLayer="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792" filterFeatures="0" hideCoverage="1" enabled="1" coverageLayerProvider="virtual" pageNameExpression="&quot;name&quot;" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20SUM(cone_len)%20AS%20[cone_len],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22" coverageLayerName="fence_groups" sortFeatures="1"/>
     </Layout>
-    <Layout name="Ask Me" printResolution="144" worldFileMap="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" units="mm">
-      <Snapper snapToItems="1" snapToGuides="1" tolerance="5" snapToGrid="0"/>
-      <Grid resUnits="mm" offsetUnits="mm" offsetY="0" offsetX="0" resolution="9"/>
+    <Layout units="mm" printResolution="144" worldFileMap="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" name="Ask Me">
+      <Snapper snapToGuides="1" tolerance="5" snapToGrid="0" snapToItems="1"/>
+      <Grid resolution="9" offsetY="0" offsetX="0" offsetUnits="mm" resUnits="mm"/>
       <PageCollection>
-        <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+        <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="255,255,255,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="no" type="QString" name="outline_style"/>
-              <Option value="0.26" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+              <Option type="QString" value="255,255,255,255" name="color"/>
+              <Option type="QString" value="miter" name="joinstyle"/>
+              <Option type="QString" value="0,0" name="offset"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+              <Option type="QString" value="MM" name="offset_unit"/>
+              <Option type="QString" value="0,0,0,255" name="outline_color"/>
+              <Option type="QString" value="no" name="outline_style"/>
+              <Option type="QString" value="0.26" name="outline_width"/>
+              <Option type="QString" value="MM" name="outline_width_unit"/>
+              <Option type="QString" value="solid" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
@@ -30642,49 +30732,49 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem outlineWidthM="0.3,mm" groupUuid="" position="0,0,mm" positionLock="false" templateUuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" uuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" type="65638" blendMode="0" size="297,210,mm" opacity="1" visibility="1" referencePoint="0" id="" frame="false" zValue="0" frameJoinStyle="miter" positionOnPage="0,0,mm" background="true" excludeFromExports="0" itemRotation="0">
-          <FrameColor red="0" green="0" blue="0" alpha="255"/>
-          <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+        <LayoutItem referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" groupUuid="" positionOnPage="0,0,mm" positionLock="false" frameJoinStyle="miter" frame="false" type="65638" outlineWidthM="0.3,mm" templateUuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" background="true" size="297,210,mm" zValue="0" uuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" opacity="1" position="0,0,mm" excludeFromExports="0">
+          <FrameColor alpha="255" red="0" blue="0" green="0"/>
+          <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="255,255,255,255" type="QString" name="color"/>
-                <Option value="miter" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="255,255,255,255" name="color"/>
+                <Option type="QString" value="miter" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                <Option type="QString" value="no" name="outline_style"/>
+                <Option type="QString" value="0.26" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -30699,59 +30789,59 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide position="0" page="0" orientation="2" units="mm"/>
+          <Guide page="0" units="mm" orientation="2" position="0"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem outlineWidthM="0.3,mm" valign="64" groupUuid="" position="4.43449,186.634,mm" positionLock="false" templateUuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" uuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" type="65641" blendMode="0" size="83.9998,10.4638,mm" opacity="1" visibility="1" htmlState="0" referencePoint="0" marginX="1" id="" halign="1" frame="false" zValue="8" labelText="Directions to Start of Race" frameJoinStyle="miter" positionOnPage="4.43449,186.634,mm" background="false" marginY="1" excludeFromExports="0" itemRotation="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem marginY="1" referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" htmlState="0" groupUuid="" positionOnPage="4.43449,186.634,mm" positionLock="false" frameJoinStyle="miter" frame="false" type="65641" outlineWidthM="0.3,mm" templateUuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" background="false" size="83.9998,10.4638,mm" labelText="Directions to Start of Race" zValue="8" uuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" opacity="1" position="4.43449,186.634,mm" marginX="1" halign="1" valign="64" excludeFromExports="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="50" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="1" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="14" namedStyle="" forcedItalic="0" fontSizeUnit="Point" allowHtml="0">
+        <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="" fontUnderline="0" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" fontWeight="50" fontStrikeout="0" fontItalic="0" fontSize="14" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferNoFill="1" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="1.5"/>
-          <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeBorderWidth="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <text-buffer bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
+            <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -30766,65 +30856,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" valign="32" groupUuid="" position="4.43449,197.498,mm" positionLock="false" templateUuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" uuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" type="65641" blendMode="0" size="48.2923,9.511,mm" opacity="1" visibility="1" htmlState="0" referencePoint="0" marginX="1" id="" halign="1" frame="false" zValue="7" labelText="Gun Run" frameJoinStyle="miter" positionOnPage="4.43449,197.498,mm" background="false" marginY="1" excludeFromExports="0" itemRotation="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem marginY="1" referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" htmlState="0" groupUuid="" positionOnPage="4.43449,197.498,mm" positionLock="false" frameJoinStyle="miter" frame="false" type="65641" outlineWidthM="0.3,mm" templateUuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" background="false" size="48.2923,9.511,mm" labelText="Gun Run" zValue="7" uuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" opacity="1" position="4.43449,197.498,mm" marginX="1" halign="1" valign="32" excludeFromExports="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="50" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="1" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="12" namedStyle="" forcedItalic="0" fontSizeUnit="Point" allowHtml="0">
+        <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="" fontUnderline="0" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" fontWeight="50" fontStrikeout="0" fontItalic="0" fontSize="12" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferNoFill="1" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="1.5"/>
-          <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeBorderWidth="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <text-buffer bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
+            <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -30839,33 +30929,33 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem rasterBorderWidth="0" outlineWidthM="0.3,mm" maxSymbolSize="0" rasterBorderColor="0,0,0,255" frameJoinStyle="round" excludeFromExports="0" title="" columnCount="1" background="true" rasterBorder="1" boxSpace="2" size="59.0766,76,mm" map_uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" legendFilterByAtlas="0" wmsLegendHeight="25" columnSpace="0" type="65642" symbolAlignment="1" id="" positionLock="false" blendMode="0" positionOnPage="10.096,10.8563,mm" splitLayer="0" resizeToContents="1" templateUuid="{303369c1-d87e-43b5-837f-91af9bdece73}" frame="true" opacity="1" uuid="{303369c1-d87e-43b5-837f-91af9bdece73}" minSymbolSize="0" fontColor="#000000" lineSpacing="2" referencePoint="0" visibility="1" wrapChar="" itemRotation="0" symbolWidth="9" wmsLegendWidth="50" groupUuid="" position="10.096,10.8563,mm" legendFilterByMap="1" symbolHeight="5" equalColumnWidth="0" titleAlignment="1" zValue="6">
-        <FrameColor red="139" green="139" blue="139" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem splitLayer="0" size="59.0766,76,mm" legendFilterByAtlas="0" boxSpace="2" templateUuid="{303369c1-d87e-43b5-837f-91af9bdece73}" blendMode="0" maxSymbolSize="0" position="10.096,10.8563,mm" groupUuid="" wrapChar="" minSymbolSize="0" referencePoint="0" symbolAlignment="1" itemRotation="0" title="" equalColumnWidth="0" resizeToContents="1" wmsLegendHeight="25" columnCount="1" outlineWidthM="0.3,mm" rasterBorder="1" background="true" legendFilterByMap="1" visibility="1" symbolHeight="5" fontColor="#000000" positionLock="false" zValue="6" titleAlignment="1" lineSpacing="2" columnSpace="0" id="" rasterBorderColor="0,0,0,255" positionOnPage="10.096,10.8563,mm" excludeFromExports="0" rasterBorderWidth="0" type="65642" wmsLegendWidth="50" uuid="{303369c1-d87e-43b5-837f-91af9bdece73}" opacity="1" frame="true" symbolWidth="9" map_uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" frameJoinStyle="round">
+        <FrameColor alpha="255" red="139" blue="139" green="139"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -30873,52 +30963,52 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style name="title" indent="0" alignment="1">
-            <styleFont bold="0" style="" italic="0" description="Myriad Pro,16,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0"/>
+          <style indent="0" alignment="1" name="title">
+            <styleFont style="" description="Myriad Pro,16,-1,5,50,0,0,0,0,0" strikethrough="0" italic="0" underline="0" bold="0"/>
           </style>
-          <style name="group" indent="0" alignment="1">
-            <styleFont bold="1" style="Semibold" italic="0" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" underline="0" strikethrough="0"/>
+          <style indent="0" alignment="1" name="group">
+            <styleFont style="Semibold" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0" italic="0" underline="0" bold="1"/>
           </style>
-          <style name="subgroup" indent="0" alignment="1">
-            <styleFont bold="1" style="Semibold" italic="0" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" underline="0" strikethrough="0"/>
+          <style indent="0" alignment="1" name="subgroup">
+            <styleFont style="Semibold" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0" italic="0" underline="0" bold="1"/>
           </style>
-          <style name="symbol" indent="0" alignment="1" marginTop="2.5">
-            <styleFont bold="0" style="" italic="0" description="Myriad Pro,12,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0"/>
+          <style marginTop="2.5" indent="0" alignment="1" name="symbol">
+            <styleFont style="" description="Myriad Pro,12,-1,5,50,0,0,0,0,0" strikethrough="0" italic="0" underline="0" bold="0"/>
           </style>
-          <style marginLeft="3" name="symbolLabel" indent="0" alignment="1" marginTop="2.5">
-            <styleFont bold="0" style="Regular" italic="0" description="Myriad Pro,14,-1,5,50,0,0,0,0,0,Regular" underline="0" strikethrough="0"/>
+          <style marginTop="2.5" marginLeft="3" indent="0" alignment="1" name="symbolLabel">
+            <styleFont style="Regular" description="Myriad Pro,14,-1,5,50,0,0,0,0,0,Regular" strikethrough="0" italic="0" underline="0" bold="0"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group checked="Qt::Checked" name="Ask Me" groupLayer="" expanded="1">
+          <layer-tree-group expanded="1" groupLayer="" checked="Qt::Checked" name="Ask Me">
             <customproperties>
               <Option type="Map">
-                <Option value="hidden" type="QString" name="legend/title-style"/>
+                <Option type="QString" value="hidden" name="legend/title-style"/>
               </Option>
             </customproperties>
-            <layer-tree-layer checked="Qt::Checked" legend_exp="" source="./poi_labels.shp|layername=poi_labels" name="poi_labels" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" providerKey="ogr" legend_split_behavior="0" patch_size="0,0" expanded="1">
+            <layer-tree-layer id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" expanded="1" legend_split_behavior="0" source="./poi_labels.shp|layername=poi_labels" legend_exp="" providerKey="ogr" patch_size="0,0" checked="Qt::Checked" name="poi_labels">
               <customproperties>
                 <Option type="Map">
-                  <Option value="Start/Finish" type="QString" name="legend/label-0"/>
-                  <Option value="Toilets" type="QString" name="legend/label-1"/>
-                  <Option value="Tog Bag Drop-off" type="QString" name="legend/label-2"/>
-                  <Option value="Road Closed to Cars" type="QString" name="legend/label-3"/>
-                  <Option value="MyCiti Drop-off" type="QString" name="legend/label-4"/>
-                  <Option value="Parking" type="QString" name="legend/label-5"/>
-                  <Option value="hidden" type="QString" name="legend/title-style"/>
+                  <Option type="QString" value="Start/Finish" name="legend/label-0"/>
+                  <Option type="QString" value="Toilets" name="legend/label-1"/>
+                  <Option type="QString" value="Tog Bag Drop-off" name="legend/label-2"/>
+                  <Option type="QString" value="Road Closed to Cars" name="legend/label-3"/>
+                  <Option type="QString" value="MyCiti Drop-off" name="legend/label-4"/>
+                  <Option type="QString" value="Parking" name="legend/label-5"/>
+                  <Option type="QString" value="hidden" name="legend/title-style"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
-            <layer-tree-layer checked="Qt::Checked" legend_exp="" source="./directions_to_start.shp|layername=directions_to_start" name="directions_to_start" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" providerKey="ogr" legend_split_behavior="0" patch_size="0,0" expanded="1">
+            <layer-tree-layer id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" expanded="1" legend_split_behavior="0" source="./directions_to_start.shp|layername=directions_to_start" legend_exp="" providerKey="ogr" patch_size="0,0" checked="Qt::Checked" name="directions_to_start">
               <customproperties>
                 <Option type="Map">
-                  <Option value="To 21KM Start (06:30)" type="QString" name="legend/label-0"/>
-                  <Option value="To 10KM Start (07:30)" type="QString" name="legend/label-1"/>
-                  <Option value="To 5KM Start (08:30)" type="QString" name="legend/label-2"/>
-                  <Option value="hidden" type="QString" name="legend/title-style"/>
+                  <Option type="QString" value="To 21KM Start (06:30)" name="legend/label-0"/>
+                  <Option type="QString" value="To 10KM Start (07:30)" name="legend/label-1"/>
+                  <Option type="QString" value="To 5KM Start (08:30)" name="legend/label-2"/>
+                  <Option type="QString" value="hidden" name="legend/title-style"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -30926,47 +31016,47 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" valign="32" groupUuid="" position="221.862,190.027,mm" positionLock="false" templateUuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" uuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" type="65641" blendMode="0" size="27.7839,6.871,mm" opacity="1" visibility="1" htmlState="0" referencePoint="0" marginX="1" id="" halign="2" frame="false" zValue="5" labelText="REVISION 1.0" frameJoinStyle="miter" positionOnPage="221.862,190.027,mm" background="false" marginY="1" excludeFromExports="0" itemRotation="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem marginY="1" referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" htmlState="0" groupUuid="" positionOnPage="221.862,190.027,mm" positionLock="false" frameJoinStyle="miter" frame="false" type="65641" outlineWidthM="0.3,mm" templateUuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" background="false" size="27.7839,6.871,mm" labelText="REVISION 1.0" zValue="5" uuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" opacity="1" position="221.862,190.027,mm" marginX="1" halign="2" valign="32" excludeFromExports="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="50" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="1" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="12" namedStyle="" forcedItalic="0" fontSizeUnit="Point" allowHtml="0">
+        <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="" fontUnderline="0" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" fontWeight="50" fontStrikeout="0" fontItalic="0" fontSize="12" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferNoFill="1" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="1.5"/>
-          <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeBorderWidth="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <text-buffer bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
+            <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -30981,65 +31071,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" valign="64" groupUuid="" position="197.975,197.498,mm" positionLock="false" templateUuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" uuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" type="65641" blendMode="0" size="51.6706,6.60801,mm" opacity="1" visibility="1" htmlState="0" referencePoint="0" marginX="1" id="" halign="2" frame="false" zValue="4" labelText="Sunday, 20 October 2019" frameJoinStyle="miter" positionOnPage="197.975,197.498,mm" background="false" marginY="1" excludeFromExports="0" itemRotation="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem marginY="1" referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" htmlState="0" groupUuid="" positionOnPage="197.975,197.498,mm" positionLock="false" frameJoinStyle="miter" frame="false" type="65641" outlineWidthM="0.3,mm" templateUuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" background="false" size="51.6706,6.60801,mm" labelText="Sunday, 20 October 2019" zValue="4" uuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" opacity="1" position="197.975,197.498,mm" marginX="1" halign="2" valign="64" excludeFromExports="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="50" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="1" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="12" namedStyle="" forcedItalic="0" fontSizeUnit="Point" allowHtml="0">
+        <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="" fontUnderline="0" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" fontWeight="50" fontStrikeout="0" fontItalic="0" fontSize="12" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferNoFill="1" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="1.5"/>
-          <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeBorderWidth="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <text-buffer bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
+            <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -31054,39 +31144,39 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" groupUuid="" position="249.646,179.724,mm" anchorPoint="4" positionLock="false" svgFillColor="255,255,255,255" templateUuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" uuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" type="65640" blendMode="0" size="42.9838,24.3824,mm" opacity="1" visibility="1" svgBorderColor="0,0,0,255" northMode="0" northOffset="0" referencePoint="0" id="" frame="false" zValue="3" mode="1" frameJoinStyle="miter" resizeMode="0" positionOnPage="249.646,179.724,mm" file="../Gun_Run_Logo.png" svgBorderWidth="0.2" pictureRotation="0" background="false" pictureHeight="24.3824" pictureWidth="24.2337" excludeFromExports="0" itemRotation="0" mapUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" mapUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" svgBorderWidth="0.2" pictureHeight="24.3824" groupUuid="" positionOnPage="249.646,179.724,mm" positionLock="false" frameJoinStyle="miter" mode="1" frame="false" type="65640" outlineWidthM="0.3,mm" resizeMode="0" file="../Gun_Run_Logo.png" northOffset="0" templateUuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" background="false" svgFillColor="255,255,255,255" pictureRotation="0" size="42.9838,24.3824,mm" zValue="3" uuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" svgBorderColor="0,0,0,255" northMode="0" opacity="1" position="249.646,179.724,mm" excludeFromExports="0" pictureWidth="24.2337" anchorPoint="4">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedSource">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -31094,42 +31184,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" groupUuid="" position="4.58449,197.248,mm" positionLock="false" templateUuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" uuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" type="65643" blendMode="0" size="244.912,0.1,mm" opacity="1" visibility="1" referencePoint="0" id="" frame="false" zValue="2" shapeType="1" cornerRadiusMeasure="0,mm" frameJoinStyle="miter" positionOnPage="4.58449,197.248,mm" background="false" excludeFromExports="0" itemRotation="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" groupUuid="" positionOnPage="4.58449,197.248,mm" positionLock="false" frameJoinStyle="miter" frame="false" type="65643" outlineWidthM="0.3,mm" shapeType="1" cornerRadiusMeasure="0,mm" templateUuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" background="false" size="244.912,0.1,mm" zValue="2" uuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" opacity="1" position="4.58449,197.248,mm" excludeFromExports="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+        <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="0,0,0,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="solid" type="QString" name="outline_style"/>
-              <Option value="0.3" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+              <Option type="QString" value="0,0,0,255" name="color"/>
+              <Option type="QString" value="miter" name="joinstyle"/>
+              <Option type="QString" value="0,0" name="offset"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+              <Option type="QString" value="MM" name="offset_unit"/>
+              <Option type="QString" value="0,0,0,255" name="outline_color"/>
+              <Option type="QString" value="solid" name="outline_style"/>
+              <Option type="QString" value="0.3" name="outline_width"/>
+              <Option type="QString" value="MM" name="outline_width_unit"/>
+              <Option type="QString" value="solid" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="0,0,0,255"/>
@@ -31144,46 +31234,46 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" groupUuid="" position="4.43449,6.411,mm" positionLock="false" templateUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" type="65639" blendMode="0" followPresetName="Ask Me" keepLayerSet="false" size="288.007,183.616,mm" opacity="1" visibility="1" referencePoint="0" id="" frame="false" followPreset="true" zValue="1" frameJoinStyle="miter" labelMargin="0,mm" positionOnPage="4.43449,6.411,mm" mapRotation="0" background="true" excludeFromExports="0" itemRotation="0" drawCanvasItems="false" mapFlags="0" isTemporal="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" drawCanvasItems="false" mapRotation="0" mapFlags="0" groupUuid="" positionOnPage="4.43449,6.411,mm" positionLock="false" frameJoinStyle="miter" followPresetName="Ask Me" frame="false" type="65639" outlineWidthM="0.3,mm" labelMargin="0,mm" templateUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" background="true" size="288.007,183.616,mm" zValue="1" uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" opacity="1" position="4.43449,6.411,mm" keepLayerSet="false" excludeFromExports="0" isTemporal="0" followPreset="true">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedMapScale">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="1" type="int" name="type"/>
-                  <Option value="" type="QString" name="val"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="int" value="1" name="type"/>
+                  <Option type="QString" value="" name="val"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapXMin">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="1" type="int" name="type"/>
-                  <Option value="" type="QString" name="val"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="int" value="1" name="type"/>
+                  <Option type="QString" value="" name="val"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapYMin">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="1" type="int" name="type"/>
-                  <Option value="" type="QString" name="val"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="int" value="1" name="type"/>
+                  <Option type="QString" value="" name="val"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.39762336729721071" ymax="-33.8970204297764468" ymin="-33.90994364588821952" xmax="18.41789384089274151"/>
+        <Extent ymax="-33.8970204297764468" xmin="18.39762336729721071" ymin="-33.90994364588821952" xmax="18.41789384089274151"/>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
             <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
@@ -31198,45 +31288,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid show="0" rotatedTicksEnabled="0" gridFrameStyle="0" crossLength="3" gridFrameMargin="0" leftFrameDivisions="0" bottomFrameDivisions="0" gridFramePenThickness="0.5" topAnnotationDisplay="0" topAnnotationPosition="1" rotatedTicksMinimumAngle="0" name="Grid 1" showAnnotation="0" rotatedAnnotationsEnabled="0" rotatedTicksLengthMode="0" annotationExpression="" intervalX="0" bottomAnnotationPosition="1" rightAnnotationDisplay="0" rotatedAnnotationsMinimumAngle="0" annotationPrecision="3" frameFillColor1="255,255,255,255" blendMode="0" offsetY="0" gridFrameWidth="2" leftAnnotationDisplay="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" rotatedAnnotationsMarginToCorner="0" topFrameDivisions="0" topAnnotationDirection="0" rightAnnotationPosition="1" rotatedTicksMarginToCorner="0" gridStyle="0" minimumIntervalWidth="50" intervalY="0" unit="0" maximumIntervalWidth="100" gridFrameSideFlags="15" frameAnnotationDistance="1" frameFillColor2="0,0,0,255" rightAnnotationDirection="0" position="3" bottomAnnotationDisplay="0" leftAnnotationPosition="1" rotatedAnnotationsLengthMode="0" annotationFormat="0" gridFramePenColor="0,0,0,255" leftAnnotationDirection="0" rightFrameDivisions="0" bottomAnnotationDirection="0" offsetX="0">
+        <ComposerMapGrid bottomAnnotationPosition="1" frameFillColor2="0,0,0,255" blendMode="0" bottomAnnotationDisplay="0" name="Grid 1" frameFillColor1="255,255,255,255" position="3" bottomFrameDivisions="0" topAnnotationPosition="1" crossLength="3" leftAnnotationDisplay="0" intervalY="0" rotatedAnnotationsMarginToCorner="0" gridFrameStyle="0" annotationFormat="0" topAnnotationDirection="0" leftFrameDivisions="0" topFrameDivisions="0" annotationPrecision="3" rotatedTicksMinimumAngle="0" rightFrameDivisions="0" maximumIntervalWidth="100" unit="0" rotatedTicksEnabled="0" topAnnotationDisplay="0" leftAnnotationPosition="1" show="0" rotatedTicksMarginToCorner="0" rotatedTicksLengthMode="0" gridStyle="0" rotatedAnnotationsMinimumAngle="0" minimumIntervalWidth="50" bottomAnnotationDirection="0" annotationExpression="" intervalX="0" offsetY="0" offsetX="0" gridFramePenColor="0,0,0,255" gridFrameMargin="0" gridFrameWidth="2" rightAnnotationDisplay="0" rotatedAnnotationsEnabled="0" leftAnnotationDirection="0" rightAnnotationDirection="0" gridFrameSideFlags="15" gridFramePenThickness="0.5" showAnnotation="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" rightAnnotationPosition="1" frameAnnotationDistance="1" rotatedAnnotationsLengthMode="0">
           <lineStyle>
-            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0,0,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0,0,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -31267,44 +31357,44 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+              <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="angle"/>
-                  <Option value="square" type="QString" name="cap_style"/>
-                  <Option value="0,0,0,255" type="QString" name="color"/>
-                  <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="circle" type="QString" name="name"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                  <Option value="solid" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="diameter" type="QString" name="scale_method"/>
-                  <Option value="2" type="QString" name="size"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="size_unit"/>
-                  <Option value="1" type="QString" name="vertical_anchor_point"/>
+                  <Option type="QString" value="0" name="angle"/>
+                  <Option type="QString" value="square" name="cap_style"/>
+                  <Option type="QString" value="0,0,0,255" name="color"/>
+                  <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="circle" name="name"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                  <Option type="QString" value="solid" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="diameter" name="scale_method"/>
+                  <Option type="QString" value="2" name="size"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="size_unit"/>
+                  <Option type="QString" value="1" name="vertical_anchor_point"/>
                 </Option>
                 <prop k="angle" v="0"/>
                 <prop k="cap_style" v="square"/>
@@ -31327,40 +31417,40 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="50" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="1" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="10" namedStyle="" forcedItalic="0" fontSizeUnit="Point" allowHtml="0">
+          <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="" fontUnderline="0" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" fontWeight="50" fontStrikeout="0" fontItalic="0" fontSize="10" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" textOrientation="horizontal">
             <families/>
-            <text-buffer bufferNoFill="1" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="1.5"/>
-            <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeBorderWidth="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-              <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <text-buffer bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+            <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskType="0"/>
+            <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
+              <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                    <Option value="255,255,255,255" type="QString" name="color"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                    <Option value="no" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="solid" type="QString" name="style"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                    <Option type="QString" value="255,255,255,255" name="color"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                    <Option type="QString" value="no" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="solid" name="style"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -31375,29 +31465,29 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+            <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -31405,56 +31495,56 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
+        <AtlasMap margin="0.10000000000000001" scalingMode="2" atlasDriven="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" enabled="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clipSource="" enabled="0" clippingType="0"/>
+        <itemClippingSettings clipSource="" forceLabelsInside="0" clippingType="0" enabled="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" type="QString" name="atlasRasterFormat"/>
-          <Option value="0" type="QString" name="forceVector"/>
-          <Option value="true" type="QString" name="imageAntialias"/>
-          <Option value="0" type="QString" name="imageCropMarginBottom"/>
-          <Option value="0" type="QString" name="imageCropMarginLeft"/>
-          <Option value="0" type="QString" name="imageCropMarginRight"/>
-          <Option value="0" type="QString" name="imageCropMarginTop"/>
-          <Option value="false" type="QString" name="imageCropToContents"/>
-          <Option value="0" type="QString" name="pdfDisableRasterTiles"/>
-          <Option value="1" type="QString" name="pdfIncludeMetadata"/>
-          <Option value="0" type="QString" name="pdfTextFormat"/>
-          <Option value="true" type="QString" name="singleFile"/>
+          <Option type="QString" value="png" name="atlasRasterFormat"/>
+          <Option type="QString" value="0" name="forceVector"/>
+          <Option type="QString" value="true" name="imageAntialias"/>
+          <Option type="QString" value="0" name="imageCropMarginBottom"/>
+          <Option type="QString" value="0" name="imageCropMarginLeft"/>
+          <Option type="QString" value="0" name="imageCropMarginRight"/>
+          <Option type="QString" value="0" name="imageCropMarginTop"/>
+          <Option type="QString" value="false" name="imageCropToContents"/>
+          <Option type="QString" value="0" name="pdfDisableRasterTiles"/>
+          <Option type="QString" value="1" name="pdfIncludeMetadata"/>
+          <Option type="QString" value="0" name="pdfTextFormat"/>
+          <Option type="QString" value="true" name="singleFile"/>
         </Option>
       </customproperties>
-      <Atlas hideCoverage="0" pageNameExpression="" sortFeatures="0" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - '||&quot;RouteLen&quot;||'KM rev '" filterFeatures="0" coverageLayer="" enabled="0"/>
+      <Atlas filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - '||&quot;RouteLen&quot;||'KM rev '" coverageLayer="" filterFeatures="0" hideCoverage="0" enabled="0" pageNameExpression="" sortFeatures="0"/>
     </Layout>
-    <Layout name="Routes" printResolution="144" worldFileMap="" units="mm">
-      <Snapper snapToItems="1" snapToGuides="1" tolerance="5" snapToGrid="0"/>
-      <Grid resUnits="mm" offsetUnits="mm" offsetY="0" offsetX="0" resolution="10"/>
+    <Layout units="mm" printResolution="144" worldFileMap="" name="Routes">
+      <Snapper snapToGuides="1" tolerance="5" snapToGrid="0" snapToItems="1"/>
+      <Grid resolution="10" offsetY="0" offsetX="0" offsetUnits="mm" resUnits="mm"/>
       <PageCollection>
-        <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+        <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="255,255,255,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="no" type="QString" name="outline_style"/>
-              <Option value="0.26" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+              <Option type="QString" value="255,255,255,255" name="color"/>
+              <Option type="QString" value="miter" name="joinstyle"/>
+              <Option type="QString" value="0,0" name="offset"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+              <Option type="QString" value="MM" name="offset_unit"/>
+              <Option type="QString" value="0,0,0,255" name="outline_color"/>
+              <Option type="QString" value="no" name="outline_style"/>
+              <Option type="QString" value="0.26" name="outline_width"/>
+              <Option type="QString" value="MM" name="outline_width_unit"/>
+              <Option type="QString" value="solid" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
@@ -31469,49 +31559,49 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem outlineWidthM="0.3,mm" groupUuid="" position="0,0,mm" positionLock="false" templateUuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" uuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" type="65638" blendMode="0" size="297,210,mm" opacity="1" visibility="1" referencePoint="0" id="" frame="false" zValue="0" frameJoinStyle="miter" positionOnPage="0,0,mm" background="true" excludeFromExports="0" itemRotation="0">
-          <FrameColor red="0" green="0" blue="0" alpha="255"/>
-          <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+        <LayoutItem referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" groupUuid="" positionOnPage="0,0,mm" positionLock="false" frameJoinStyle="miter" frame="false" type="65638" outlineWidthM="0.3,mm" templateUuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" background="true" size="297,210,mm" zValue="0" uuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" opacity="1" position="0,0,mm" excludeFromExports="0">
+          <FrameColor alpha="255" red="0" blue="0" green="0"/>
+          <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="255,255,255,255" type="QString" name="color"/>
-                <Option value="miter" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="255,255,255,255" name="color"/>
+                <Option type="QString" value="miter" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                <Option type="QString" value="no" name="outline_style"/>
+                <Option type="QString" value="0.26" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -31526,59 +31616,59 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide position="0" page="0" orientation="2" units="mm"/>
+          <Guide page="0" units="mm" orientation="2" position="0"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem outlineWidthM="0.3,mm" valign="64" groupUuid="" position="200.171,199.082,mm" positionLock="true" templateUuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" uuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" type="65641" blendMode="0" size="61.5373,6.8714,mm" opacity="1" visibility="1" htmlState="0" referencePoint="0" marginX="1" id="" halign="2" frame="false" zValue="13" labelText="REVISION 3" frameJoinStyle="miter" positionOnPage="200.171,199.082,mm" background="false" marginY="1" excludeFromExports="0" itemRotation="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem marginY="0" referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" htmlState="0" groupUuid="" positionOnPage="200.171,199.082,mm" positionLock="true" frameJoinStyle="miter" frame="false" type="65641" outlineWidthM="0.3,mm" templateUuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" background="false" size="61.5373,6.8714,mm" labelText="REVISION 3.1" zValue="13" uuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" opacity="1" position="200.171,199.082,mm" marginX="0" halign="2" valign="32" excludeFromExports="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="50" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="1" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="12" namedStyle="" forcedItalic="0" fontSizeUnit="Point" allowHtml="0">
+        <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="" fontUnderline="0" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" fontWeight="50" fontStrikeout="0" fontItalic="0" fontSize="12" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferNoFill="1" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="1.5"/>
-          <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeBorderWidth="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <text-buffer bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
+            <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -31593,65 +31683,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" valign="64" groupUuid="" position="9.7863,192.073,mm" positionLock="true" templateUuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" uuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" type="65641" blendMode="0" size="61.5373,6.60801,mm" opacity="1" visibility="1" htmlState="0" referencePoint="0" marginX="1" id="" halign="1" frame="false" zValue="12" labelText="Gun Run 2022: [%&quot;Source&quot;%]" frameJoinStyle="miter" positionOnPage="9.7863,192.073,mm" background="false" marginY="1" excludeFromExports="0" itemRotation="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem marginY="0" referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" htmlState="0" groupUuid="" positionOnPage="9.7863,192.073,mm" positionLock="true" frameJoinStyle="miter" frame="false" type="65641" outlineWidthM="0.3,mm" templateUuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" background="false" size="61.5373,6.60801,mm" labelText="Gun Run 2022: [%&quot;Source&quot;%]" zValue="12" uuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" opacity="1" position="9.7863,192.073,mm" marginX="0" halign="1" valign="64" excludeFromExports="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="50" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="1" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="12" namedStyle="" forcedItalic="0" fontSizeUnit="Point" allowHtml="0">
+        <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="" fontUnderline="0" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" fontWeight="50" fontStrikeout="0" fontItalic="0" fontSize="12" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferNoFill="1" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="1.5"/>
-          <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeBorderWidth="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <text-buffer bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
+            <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -31666,65 +31756,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" valign="64" groupUuid="" position="9.7863,199.082,mm" positionLock="true" templateUuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" uuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" type="65641" blendMode="0" size="61.5373,6.60801,mm" opacity="1" visibility="1" htmlState="0" referencePoint="0" marginX="1" id="" halign="1" frame="false" zValue="11" labelText="[% if( regexp_match( &quot;Source&quot;, '^(5|Trail)' ),&#xa; 'Saturday, 17 September 2022',&#xa; 'Sunday, 18 September 2022'&#xa;)%]" frameJoinStyle="miter" positionOnPage="9.7863,199.082,mm" background="false" marginY="1" excludeFromExports="0" itemRotation="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem marginY="0" referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" htmlState="0" groupUuid="" positionOnPage="9.7863,199.082,mm" positionLock="true" frameJoinStyle="miter" frame="false" type="65641" outlineWidthM="0.3,mm" templateUuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" background="false" size="61.5373,6.60801,mm" labelText="[% if( regexp_match( &quot;Source&quot;, '^(5|Trail)' ),&#xa; 'Saturday, 17 September 2022',&#xa; 'Sunday, 18 September 2022'&#xa;)%]" zValue="11" uuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" opacity="1" position="9.7863,199.082,mm" marginX="0" halign="1" valign="32" excludeFromExports="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="50" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="1" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="12" namedStyle="" forcedItalic="0" fontSizeUnit="Point" allowHtml="0">
+        <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="" fontUnderline="0" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" fontWeight="50" fontStrikeout="0" fontItalic="0" fontSize="12" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferNoFill="1" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="1.5"/>
-          <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeBorderWidth="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <text-buffer bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
+            <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -31739,39 +31829,39 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" groupUuid="" position="262.196,188.218,mm" anchorPoint="4" positionLock="true" svgFillColor="255,255,255,255" templateUuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" uuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" type="65640" blendMode="0" size="29.7523,17.4718,mm" opacity="1" visibility="1" svgBorderColor="0,0,0,255" northMode="0" northOffset="0" referencePoint="0" id="" frame="false" zValue="10" mode="1" frameJoinStyle="miter" resizeMode="0" positionOnPage="262.196,188.218,mm" file="../GunRun2022_250.png" svgBorderWidth="0.2" pictureRotation="0" background="false" pictureHeight="15.9472" pictureWidth="29.7523" excludeFromExports="0" itemRotation="0" mapUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" mapUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" svgBorderWidth="0.2" pictureHeight="15.9472" groupUuid="" positionOnPage="262.196,188.218,mm" positionLock="true" frameJoinStyle="miter" mode="1" frame="false" type="65640" outlineWidthM="0.3,mm" resizeMode="0" file="../GunRun2022_250.png" northOffset="0" templateUuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" background="false" svgFillColor="255,255,255,255" pictureRotation="0" size="29.7523,17.4718,mm" zValue="10" uuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" svgBorderColor="0,0,0,255" northMode="0" opacity="1" position="262.196,188.218,mm" excludeFromExports="0" pictureWidth="29.7523" anchorPoint="4">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedSource">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -31779,42 +31869,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" groupUuid="" position="9.57644,198.832,mm" positionLock="true" templateUuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" uuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" type="65643" blendMode="0" size="251.982,0.1,mm" opacity="1" visibility="1" referencePoint="0" id="" frame="false" zValue="9" shapeType="1" cornerRadiusMeasure="0,mm" frameJoinStyle="miter" positionOnPage="9.57644,198.832,mm" background="false" excludeFromExports="0" itemRotation="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" groupUuid="" positionOnPage="9.57644,198.832,mm" positionLock="true" frameJoinStyle="miter" frame="false" type="65643" outlineWidthM="0.3,mm" shapeType="1" cornerRadiusMeasure="0,mm" templateUuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" background="false" size="251.982,0.1,mm" zValue="9" uuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" opacity="1" position="9.57644,198.832,mm" excludeFromExports="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+        <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="0,0,0,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="solid" type="QString" name="outline_style"/>
-              <Option value="0.3" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+              <Option type="QString" value="0,0,0,255" name="color"/>
+              <Option type="QString" value="miter" name="joinstyle"/>
+              <Option type="QString" value="0,0" name="offset"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+              <Option type="QString" value="MM" name="offset_unit"/>
+              <Option type="QString" value="0,0,0,255" name="outline_color"/>
+              <Option type="QString" value="solid" name="outline_style"/>
+              <Option type="QString" value="0.3" name="outline_width"/>
+              <Option type="QString" value="MM" name="outline_width_unit"/>
+              <Option type="QString" value="solid" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="0,0,0,255"/>
@@ -31829,321 +31919,321 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" groupUuid="" position="9.57644,5.42566,mm" positionLock="true" templateUuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" uuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" type="65639" blendMode="0" followPresetName="Routes" keepLayerSet="false" size="107.861,186.385,mm" opacity="1" visibility="1" referencePoint="0" id="Trail Finish" frame="true" followPreset="true" zValue="8" frameJoinStyle="miter" labelMargin="0,mm" positionOnPage="9.57644,5.42566,mm" mapRotation="0" background="true" excludeFromExports="0" itemRotation="0" drawCanvasItems="true" mapFlags="0" isTemporal="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem referencePoint="0" blendMode="0" itemRotation="0" id="Trail Finish" visibility="1" drawCanvasItems="true" mapRotation="0" mapFlags="0" groupUuid="" positionOnPage="9.57644,5.42566,mm" positionLock="true" frameJoinStyle="miter" followPresetName="Routes" frame="true" type="65639" outlineWidthM="0.3,mm" labelMargin="0,mm" templateUuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" background="true" size="107.861,186.385,mm" zValue="8" uuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" opacity="1" position="9.57644,5.42566,mm" keepLayerSet="false" excludeFromExports="0" isTemporal="0" followPreset="true">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedOpacity">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.39314911415855391" ymax="-33.90007566747966905" ymin="-33.93243205975926458" xmax="18.41187375074135701"/>
+        <Extent ymax="-33.90007566747966905" xmin="18.39314911415855391" ymin="-33.93243205975926458" xmax="18.41187375074135701"/>
         <LayerSet/>
-        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
+        <AtlasMap margin="0.10000000000000001" scalingMode="2" atlasDriven="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="1">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="1" enabled="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clipSource="" enabled="0" clippingType="1"/>
+        <itemClippingSettings clipSource="" forceLabelsInside="0" clippingType="1" enabled="0"/>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" groupUuid="" position="112.643,4.09761,mm" positionLock="true" templateUuid="{01af805d-ea17-430b-b08a-fc3789925456}" uuid="{01af805d-ea17-430b-b08a-fc3789925456}" type="65639" blendMode="0" followPresetName="Routes" keepLayerSet="false" size="179.156,189.279,mm" opacity="1" visibility="1" referencePoint="0" id="Trail Start" frame="true" followPreset="true" zValue="7" frameJoinStyle="miter" labelMargin="0,mm" positionOnPage="112.643,4.09761,mm" mapRotation="0" background="true" excludeFromExports="0" itemRotation="0" drawCanvasItems="true" mapFlags="0" isTemporal="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem referencePoint="0" blendMode="0" itemRotation="0" id="Trail Start" visibility="1" drawCanvasItems="true" mapRotation="0" mapFlags="0" groupUuid="" positionOnPage="112.643,4.09761,mm" positionLock="true" frameJoinStyle="miter" followPresetName="Routes" frame="true" type="65639" outlineWidthM="0.3,mm" labelMargin="0,mm" templateUuid="{01af805d-ea17-430b-b08a-fc3789925456}" background="true" size="179.156,189.279,mm" zValue="7" uuid="{01af805d-ea17-430b-b08a-fc3789925456}" opacity="1" position="112.643,4.09761,mm" keepLayerSet="false" excludeFromExports="0" isTemporal="0" followPreset="true">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedOpacity">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.3924263991010406" ymax="-33.92484901666441743" ymin="-33.95772328900195447" xmax="18.42354248737832023"/>
+        <Extent ymax="-33.92484901666441743" xmin="18.3924263991010406" ymin="-33.95772328900195447" xmax="18.42354248737832023"/>
         <LayerSet/>
-        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
+        <AtlasMap margin="0.10000000000000001" scalingMode="2" atlasDriven="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="1">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="1" enabled="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clipSource="" enabled="0" clippingType="1"/>
+        <itemClippingSettings clipSource="" forceLabelsInside="0" clippingType="1" enabled="0"/>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" groupUuid="" position="5.86559,4.09761,mm" positionLock="true" templateUuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" uuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" type="65639" blendMode="0" followPresetName="Routes" keepLayerSet="false" size="67.7828,166.874,mm" opacity="1" visibility="1" referencePoint="0" id="Left inset 21KM" frame="true" followPreset="true" zValue="6" frameJoinStyle="miter" labelMargin="0,mm" positionOnPage="5.86559,4.09761,mm" mapRotation="0" background="true" excludeFromExports="0" itemRotation="0" drawCanvasItems="false" mapFlags="0" isTemporal="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem referencePoint="0" blendMode="0" itemRotation="0" id="Left inset 21KM" visibility="1" drawCanvasItems="false" mapRotation="0" mapFlags="0" groupUuid="" positionOnPage="5.86559,4.09761,mm" positionLock="true" frameJoinStyle="miter" followPresetName="Routes" frame="true" type="65639" outlineWidthM="0.3,mm" labelMargin="0,mm" templateUuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" background="true" size="67.7828,166.874,mm" zValue="6" uuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" opacity="1" position="5.86559,4.09761,mm" keepLayerSet="false" excludeFromExports="0" isTemporal="0" followPreset="true">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedMapScale">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '12500'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '12500'&#xa;END" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapXMax">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.424'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.419'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.417'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.424'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.419'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.417'&#xa;END" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapXMin">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.374'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.374'&#xa;END" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapYMax">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.893'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.897'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.898'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.893'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.897'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.898'&#xa;END" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapYMin">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.947'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.947'&#xa;END" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedOpacity">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="100.0 - (if( &quot;Source&quot; = '21KM', '0', '100' ))" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="100.0 - (if( &quot;Source&quot; = '21KM', '0', '100' ))" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.37399999999999878" ymax="-33.91681492292400435" ymin="-33.94700000000000273" xmax="18.38626092146919788"/>
+        <Extent ymax="-33.91681492292400435" xmin="18.37399999999999878" ymin="-33.94700000000000273" xmax="18.38626092146919788"/>
         <LayerSet/>
-        <AtlasMap margin="0.05" atlasDriven="0" scalingMode="2"/>
+        <AtlasMap margin="0.05" scalingMode="2" atlasDriven="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" enabled="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clipSource="" enabled="0" clippingType="0"/>
+        <itemClippingSettings clipSource="" forceLabelsInside="0" clippingType="0" enabled="0"/>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" groupUuid="" position="126.141,118.975,mm" positionLock="true" templateUuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" uuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" type="65639" blendMode="0" followPresetName="Routes" keepLayerSet="false" size="113.3,76.1023,mm" opacity="1" visibility="1" referencePoint="0" id="Bottom inset 21KM" frame="true" followPreset="true" zValue="5" frameJoinStyle="miter" labelMargin="0,mm" positionOnPage="126.141,118.975,mm" mapRotation="0" background="true" excludeFromExports="0" itemRotation="0" drawCanvasItems="true" mapFlags="0" isTemporal="0">
-        <FrameColor red="103" green="34" blue="144" alpha="255"/>
-        <BackgroundColor red="200" green="175" blue="215" alpha="255"/>
+      <LayoutItem referencePoint="0" blendMode="0" itemRotation="0" id="Bottom inset 21KM" visibility="1" drawCanvasItems="true" mapRotation="0" mapFlags="0" groupUuid="" positionOnPage="133.191,119.125,mm" positionLock="true" frameJoinStyle="miter" followPresetName="Routes" frame="true" type="65639" outlineWidthM="0.3,mm" labelMargin="0,mm" templateUuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" background="true" size="113.3,76.1023,mm" zValue="5" uuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" opacity="1" position="133.191,119.125,mm" keepLayerSet="false" excludeFromExports="0" isTemporal="0" followPreset="true">
+        <FrameColor alpha="255" red="103" blue="144" green="34"/>
+        <BackgroundColor alpha="255" red="200" blue="215" green="175"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedOpacity">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="100.0 - (if( &quot;Source&quot; = '21KM', '0', '100' ))" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="100.0 - (if( &quot;Source&quot; = '21KM', '0', '100' ))" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.41509620662891678" ymax="-33.91132718340826813" ymin="-33.9168317482614512" xmax="18.42329132157224336"/>
+        <Extent ymax="-33.91132718340826813" xmin="18.41509620662891678" ymin="-33.9168317482614512" xmax="18.42329132157224336"/>
         <LayerSet/>
-        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="0"/>
+        <AtlasMap margin="0.10000000000000001" scalingMode="0" atlasDriven="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="1">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="1" enabled="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clipSource="" enabled="0" clippingType="1"/>
+        <itemClippingSettings clipSource="" forceLabelsInside="0" clippingType="1" enabled="0"/>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" groupUuid="" position="19.6693,7.89412,mm" positionLock="true" templateUuid="{049d9e83-6801-4e4c-b598-d6a49a1d9d81}" uuid="{049d9e83-6801-4e4c-b598-d6a49a1d9d81}" type="65639" blendMode="0" followPresetName="Routes" keepLayerSet="false" size="68.3676,117.12,mm" opacity="1" visibility="0" referencePoint="0" id="End inset Trail" frame="true" followPreset="true" zValue="4" frameJoinStyle="miter" labelMargin="0,mm" positionOnPage="19.6693,7.89412,mm" mapRotation="0" background="true" excludeFromExports="0" itemRotation="0" drawCanvasItems="true" mapFlags="0" isTemporal="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem referencePoint="0" blendMode="0" itemRotation="0" id="End inset Trail" visibility="0" drawCanvasItems="true" mapRotation="0" mapFlags="0" groupUuid="" positionOnPage="19.6693,7.89412,mm" positionLock="true" frameJoinStyle="miter" followPresetName="Routes" frame="true" type="65639" outlineWidthM="0.3,mm" labelMargin="0,mm" templateUuid="{049d9e83-6801-4e4c-b598-d6a49a1d9d81}" background="true" size="68.3676,117.12,mm" zValue="4" uuid="{049d9e83-6801-4e4c-b598-d6a49a1d9d81}" opacity="1" position="19.6693,7.89412,mm" keepLayerSet="false" excludeFromExports="0" isTemporal="0" followPreset="true">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedOpacity">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.4044900556177744" ymax="-33.90099106513847005" ymin="-33.91454383501641701" xmax="18.41240136424316276"/>
+        <Extent ymax="-33.90099106513847005" xmin="18.4044900556177744" ymin="-33.91454383501641701" xmax="18.41240136424316276"/>
         <LayerSet/>
-        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
+        <AtlasMap margin="0.10000000000000001" scalingMode="2" atlasDriven="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="1">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="1" enabled="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clipSource="" enabled="0" clippingType="1"/>
+        <itemClippingSettings clipSource="" forceLabelsInside="0" clippingType="1" enabled="0"/>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" groupUuid="" position="170.062,49.6297,mm" positionLock="true" templateUuid="{e02b974b-51c7-4d24-8314-a65c125ff5d1}" uuid="{e02b974b-51c7-4d24-8314-a65c125ff5d1}" type="65639" blendMode="0" followPresetName="Routes" keepLayerSet="false" size="63.655,88.3012,mm" opacity="1" visibility="0" referencePoint="0" id="Start inset Trail" frame="true" followPreset="true" zValue="3" frameJoinStyle="miter" labelMargin="0,mm" positionOnPage="170.062,49.6297,mm" mapRotation="0" background="true" excludeFromExports="0" itemRotation="0" drawCanvasItems="true" mapFlags="0" isTemporal="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem referencePoint="0" blendMode="0" itemRotation="0" id="Start inset Trail" visibility="0" drawCanvasItems="true" mapRotation="0" mapFlags="0" groupUuid="" positionOnPage="170.062,49.6297,mm" positionLock="true" frameJoinStyle="miter" followPresetName="Routes" frame="true" type="65639" outlineWidthM="0.3,mm" labelMargin="0,mm" templateUuid="{e02b974b-51c7-4d24-8314-a65c125ff5d1}" background="true" size="63.655,88.3012,mm" zValue="3" uuid="{e02b974b-51c7-4d24-8314-a65c125ff5d1}" opacity="1" position="170.062,49.6297,mm" keepLayerSet="false" excludeFromExports="0" isTemporal="0" followPreset="true">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedOpacity">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.41445559427620893" ymax="-33.94253141264477591" ymin="-33.94823764719958348" xmax="18.4185691326545431"/>
+        <Extent ymax="-33.94253141264477591" xmin="18.41445559427620893" ymin="-33.94823764719958348" xmax="18.4185691326545431"/>
         <LayerSet/>
-        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
+        <AtlasMap margin="0.10000000000000001" scalingMode="2" atlasDriven="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="1">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="1" enabled="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clipSource="" enabled="0" clippingType="1"/>
+        <itemClippingSettings clipSource="" forceLabelsInside="0" clippingType="1" enabled="0"/>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" groupUuid="" position="200.321,125.314,mm" positionLock="true" templateUuid="{917a530c-14f4-4ed8-b109-961939435221}" uuid="{917a530c-14f4-4ed8-b109-961939435221}" type="65639" blendMode="0" followPresetName="Routes" keepLayerSet="false" size="75.8756,69.7635,mm" opacity="1" visibility="0" referencePoint="0" id="Contour inset Trail" frame="true" followPreset="true" zValue="2" frameJoinStyle="miter" labelMargin="0,mm" positionOnPage="200.321,125.314,mm" mapRotation="0" background="true" excludeFromExports="0" itemRotation="0" drawCanvasItems="true" mapFlags="0" isTemporal="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem referencePoint="0" blendMode="0" itemRotation="0" id="Contour inset Trail" visibility="0" drawCanvasItems="true" mapRotation="0" mapFlags="0" groupUuid="" positionOnPage="200.321,125.314,mm" positionLock="true" frameJoinStyle="miter" followPresetName="Routes" frame="true" type="65639" outlineWidthM="0.3,mm" labelMargin="0,mm" templateUuid="{917a530c-14f4-4ed8-b109-961939435221}" background="true" size="75.8756,69.7635,mm" zValue="2" uuid="{917a530c-14f4-4ed8-b109-961939435221}" opacity="1" position="200.321,125.314,mm" keepLayerSet="false" excludeFromExports="0" isTemporal="0" followPreset="true">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedOpacity">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.41234259163472942" ymax="-33.94692690566557047" ymin="-33.95702588572736147" xmax="18.42332635419156972"/>
+        <Extent ymax="-33.94692690566557047" xmin="18.41234259163472942" ymin="-33.95702588572736147" xmax="18.42332635419156972"/>
         <LayerSet/>
-        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
+        <AtlasMap margin="0.10000000000000001" scalingMode="2" atlasDriven="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="1">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="1" enabled="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clipSource="" enabled="0" clippingType="1"/>
+        <itemClippingSettings clipSource="" forceLabelsInside="0" clippingType="1" enabled="0"/>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.15,mm" groupUuid="" position="9.50144,5.50066,mm" positionLock="true" templateUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" uuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" type="65639" blendMode="0" followPresetName="Routes" keepLayerSet="false" size="282.372,186.105,mm" opacity="1" visibility="1" referencePoint="0" id="Main Map" frame="true" followPreset="true" zValue="1" frameJoinStyle="round" labelMargin="0,mm" positionOnPage="9.50144,5.50066,mm" mapRotation="0" background="true" excludeFromExports="0" itemRotation="0" drawCanvasItems="true" mapFlags="0" isTemporal="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem referencePoint="0" blendMode="0" itemRotation="0" id="Main Map" visibility="1" drawCanvasItems="true" mapRotation="0" mapFlags="0" groupUuid="" positionOnPage="9.50144,5.50066,mm" positionLock="false" frameJoinStyle="round" followPresetName="Routes" frame="true" type="65639" outlineWidthM="0.15,mm" labelMargin="0,mm" templateUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" background="true" size="282.372,186.105,mm" zValue="1" uuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" opacity="1" position="9.50144,5.50066,mm" keepLayerSet="false" excludeFromExports="0" isTemporal="0" followPreset="true">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedMapScale">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '12500'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '9000'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '4500'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '22000'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '12500'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '9000'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '4500'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '22000'&#xa;END" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapXMin">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '18.372'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '18.381'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '18.393'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '18.364'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '18.372'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '18.380'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '18.393'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '18.364'&#xa;END" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapYMin">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '-33.926'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '-33.920'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '-33.911'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '-33.959'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '-33.926'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '-33.922'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '-33.911'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '-33.959'&#xa;END" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.36400000000000077" ymax="-33.89975491889535419" ymin="-33.95900000000000318" xmax="18.45389078066072486"/>
+        <Extent ymax="-33.89975491900727889" xmin="18.36400000000000077" ymin="-33.95900000000000318" xmax="18.45389078049076304"/>
         <LayerSet/>
-        <ComposerMapGrid show="0" rotatedTicksEnabled="0" gridFrameStyle="0" crossLength="3" gridFrameMargin="0" leftFrameDivisions="0" bottomFrameDivisions="0" gridFramePenThickness="0.5" topAnnotationDisplay="0" topAnnotationPosition="1" rotatedTicksMinimumAngle="0" name="Grid 1" showAnnotation="0" rotatedAnnotationsEnabled="0" rotatedTicksLengthMode="0" annotationExpression="" intervalX="0" bottomAnnotationPosition="1" rightAnnotationDisplay="0" rotatedAnnotationsMinimumAngle="0" annotationPrecision="3" frameFillColor1="255,255,255,255" blendMode="0" offsetY="0" gridFrameWidth="2" leftAnnotationDisplay="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" rotatedAnnotationsMarginToCorner="0" topFrameDivisions="0" topAnnotationDirection="0" rightAnnotationPosition="1" rotatedTicksMarginToCorner="0" gridStyle="0" minimumIntervalWidth="50" intervalY="0" unit="0" maximumIntervalWidth="100" gridFrameSideFlags="15" frameAnnotationDistance="1" frameFillColor2="0,0,0,255" rightAnnotationDirection="0" position="3" bottomAnnotationDisplay="0" leftAnnotationPosition="1" rotatedAnnotationsLengthMode="0" annotationFormat="0" gridFramePenColor="0,0,0,255" leftAnnotationDirection="0" rightFrameDivisions="0" bottomAnnotationDirection="0" offsetX="0">
+        <ComposerMapGrid bottomAnnotationPosition="1" frameFillColor2="0,0,0,255" blendMode="0" bottomAnnotationDisplay="0" name="Grid 1" frameFillColor1="255,255,255,255" position="3" bottomFrameDivisions="0" topAnnotationPosition="1" crossLength="3" leftAnnotationDisplay="0" intervalY="0" rotatedAnnotationsMarginToCorner="0" gridFrameStyle="0" annotationFormat="0" topAnnotationDirection="0" leftFrameDivisions="0" topFrameDivisions="0" annotationPrecision="3" rotatedTicksMinimumAngle="0" rightFrameDivisions="0" maximumIntervalWidth="100" unit="0" rotatedTicksEnabled="0" topAnnotationDisplay="0" leftAnnotationPosition="1" show="0" rotatedTicksMarginToCorner="0" rotatedTicksLengthMode="0" gridStyle="0" rotatedAnnotationsMinimumAngle="0" minimumIntervalWidth="50" bottomAnnotationDirection="0" annotationExpression="" intervalX="0" offsetY="0" offsetX="0" gridFramePenColor="0,0,0,255" gridFrameMargin="0" gridFrameWidth="2" rightAnnotationDisplay="0" rotatedAnnotationsEnabled="0" leftAnnotationDirection="0" rightAnnotationDirection="0" gridFrameSideFlags="15" gridFramePenThickness="0.5" showAnnotation="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" rightAnnotationPosition="1" frameAnnotationDistance="1" rotatedAnnotationsLengthMode="0">
           <lineStyle>
-            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0,0,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0,0,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -32174,44 +32264,44 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+              <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="angle"/>
-                  <Option value="square" type="QString" name="cap_style"/>
-                  <Option value="0,0,0,255" type="QString" name="color"/>
-                  <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="circle" type="QString" name="name"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                  <Option value="solid" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="diameter" type="QString" name="scale_method"/>
-                  <Option value="2" type="QString" name="size"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="size_unit"/>
-                  <Option value="1" type="QString" name="vertical_anchor_point"/>
+                  <Option type="QString" value="0" name="angle"/>
+                  <Option type="QString" value="square" name="cap_style"/>
+                  <Option type="QString" value="0,0,0,255" name="color"/>
+                  <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="circle" name="name"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                  <Option type="QString" value="solid" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="diameter" name="scale_method"/>
+                  <Option type="QString" value="2" name="size"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="size_unit"/>
+                  <Option type="QString" value="1" name="vertical_anchor_point"/>
                 </Option>
                 <prop k="angle" v="0"/>
                 <prop k="cap_style" v="square"/>
@@ -32234,40 +32324,40 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="50" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="1" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="10" namedStyle="" forcedItalic="0" fontSizeUnit="Point" allowHtml="0">
+          <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="" fontUnderline="0" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" fontWeight="50" fontStrikeout="0" fontItalic="0" fontSize="10" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" textOrientation="horizontal">
             <families/>
-            <text-buffer bufferNoFill="1" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="1.5"/>
-            <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeBorderWidth="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-              <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <text-buffer bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+            <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskType="0"/>
+            <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
+              <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                    <Option value="255,255,255,255" type="QString" name="color"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                    <Option value="no" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="solid" type="QString" name="style"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                    <Option type="QString" value="255,255,255,255" name="color"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                    <Option type="QString" value="no" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="solid" name="style"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -32282,29 +32372,29 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+            <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -32312,34 +32402,34 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <ComposerMapOverview inverted="0" centered="0" uuid="{e010b26c-eb3c-4800-b436-eead87b4cf37}" show="1" frameMap="{4228b319-f275-4a0b-ac13-4898f517cf3f}" position="3" blendMode="0" name="Overview 1">
-          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+        <ComposerMapOverview blendMode="0" inverted="0" frameMap="{4228b319-f275-4a0b-ac13-4898f517cf3f}" centered="0" position="3" uuid="{e010b26c-eb3c-4800-b436-eead87b4cf37}" show="1" name="Overview 1">
+          <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option type="Map" name="properties">
                   <Option type="Map" name="alpha">
-                    <Option value="true" type="bool" name="active"/>
-                    <Option value="100.0 - (if( &quot;RouteLen&quot; = '21', '0', '100' ))" type="QString" name="expression"/>
-                    <Option value="3" type="int" name="type"/>
+                    <Option type="bool" value="true" name="active"/>
+                    <Option type="QString" value="100.0 - (if( &quot;RouteLen&quot; = '21', '0', '100' ))" name="expression"/>
+                    <Option type="int" value="3" name="type"/>
                   </Option>
                 </Option>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="103,34,144,26" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="103,34,144,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="103,34,144,26" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="103,34,144,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.26" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="103,34,144,26"/>
@@ -32354,9 +32444,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -32364,9 +32454,9 @@ def my_form_open(dialog, layer, feature):
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -32374,63 +32464,63 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapOverview>
-        <AtlasMap margin="0.06" atlasDriven="0" scalingMode="2"/>
+        <AtlasMap margin="0.06" scalingMode="2" atlasDriven="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" enabled="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clipSource="" enabled="0" clippingType="0"/>
+        <itemClippingSettings clipSource="" forceLabelsInside="0" clippingType="0" enabled="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" type="QString" name="atlasRasterFormat"/>
-          <Option value="0" type="int" name="forceVector"/>
-          <Option value="true" type="QString" name="imageAntialias"/>
-          <Option value="0" type="QString" name="imageCropMarginBottom"/>
-          <Option value="0" type="QString" name="imageCropMarginLeft"/>
-          <Option value="0" type="QString" name="imageCropMarginRight"/>
-          <Option value="0" type="QString" name="imageCropMarginTop"/>
-          <Option value="false" type="QString" name="imageCropToContents"/>
-          <Option value="1" type="int" name="pdfAppendGeoreference"/>
-          <Option value="0" type="int" name="pdfCreateGeoPdf"/>
-          <Option value="0" type="int" name="pdfDisableRasterTiles"/>
-          <Option value="" type="QString" name="pdfExportThemes"/>
-          <Option value="1" type="int" name="pdfIncludeMetadata"/>
-          <Option value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~fence_groups_cbaea960_3348_4aea_b155_46e5d310f792~~~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~~~route_markers_d58f7174_b6d0_4e1c_80ed_0d74635b8ca6" type="QString" name="pdfLayerOrder"/>
-          <Option value="0" type="int" name="pdfLosslessImages"/>
-          <Option value="0" type="int" name="pdfOgcBestPracticeFormat"/>
-          <Option value="1" type="int" name="pdfSimplify"/>
-          <Option value="0" type="int" name="pdfTextFormat"/>
-          <Option value="true" type="QString" name="singleFile"/>
+          <Option type="QString" value="png" name="atlasRasterFormat"/>
+          <Option type="int" value="0" name="forceVector"/>
+          <Option type="QString" value="true" name="imageAntialias"/>
+          <Option type="QString" value="0" name="imageCropMarginBottom"/>
+          <Option type="QString" value="0" name="imageCropMarginLeft"/>
+          <Option type="QString" value="0" name="imageCropMarginRight"/>
+          <Option type="QString" value="0" name="imageCropMarginTop"/>
+          <Option type="QString" value="false" name="imageCropToContents"/>
+          <Option type="int" value="1" name="pdfAppendGeoreference"/>
+          <Option type="int" value="0" name="pdfCreateGeoPdf"/>
+          <Option type="int" value="0" name="pdfDisableRasterTiles"/>
+          <Option type="QString" value="" name="pdfExportThemes"/>
+          <Option type="int" value="1" name="pdfIncludeMetadata"/>
+          <Option type="QString" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~fence_groups_cbaea960_3348_4aea_b155_46e5d310f792~~~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~~~route_markers_4e92bf25_f500_4b5f_bf49_9dd0b475a0c9" name="pdfLayerOrder"/>
+          <Option type="int" value="0" name="pdfLosslessImages"/>
+          <Option type="int" value="0" name="pdfOgcBestPracticeFormat"/>
+          <Option type="int" value="1" name="pdfSimplify"/>
+          <Option type="int" value="0" name="pdfTextFormat"/>
+          <Option type="QString" value="true" name="singleFile"/>
         </Option>
       </customproperties>
-      <Atlas hideCoverage="0" pageNameExpression="&quot;Distance&quot;" sortFeatures="1" coverageLayerSource="/home/tim/Documents/Projects/2022/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'" coverageLayerName="all_routes" sortAscending="1" filterFeatures="1" featureFilter="regexp_match( &quot;Source&quot;, '^(5|10|21|Trail)' )" coverageLayer="all_routes_5833accf_77da_42ef_a24a_197208cd2190" sortKey="&quot;Sort&quot;" coverageLayerProvider="ogr" enabled="1"/>
+      <Atlas sortKey="&quot;Sort&quot;" sortAscending="1" filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" coverageLayer="all_routes_5833accf_77da_42ef_a24a_197208cd2190" filterFeatures="1" hideCoverage="0" enabled="1" coverageLayerProvider="ogr" pageNameExpression="&quot;Distance&quot;" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/all_routes.shp|layername=all_routes" featureFilter="regexp_match( &quot;Source&quot;, '^(5|10|21|Trail)' )" coverageLayerName="all_routes" sortFeatures="1"/>
     </Layout>
-    <Layout name="Marshal Plan A1" printResolution="120" worldFileMap="" units="mm">
-      <Snapper snapToItems="1" snapToGuides="1" tolerance="5" snapToGrid="0"/>
-      <Grid resUnits="mm" offsetUnits="mm" offsetY="0" offsetX="0" resolution="10"/>
+    <Layout units="mm" printResolution="120" worldFileMap="" name="Marshal Plan A1">
+      <Snapper snapToGuides="1" tolerance="5" snapToGrid="0" snapToItems="1"/>
+      <Grid resolution="10" offsetY="0" offsetX="0" offsetUnits="mm" resUnits="mm"/>
       <PageCollection>
-        <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+        <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="255,255,255,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="no" type="QString" name="outline_style"/>
-              <Option value="0.26" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+              <Option type="QString" value="255,255,255,255" name="color"/>
+              <Option type="QString" value="miter" name="joinstyle"/>
+              <Option type="QString" value="0,0" name="offset"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+              <Option type="QString" value="MM" name="offset_unit"/>
+              <Option type="QString" value="0,0,0,255" name="outline_color"/>
+              <Option type="QString" value="no" name="outline_style"/>
+              <Option type="QString" value="0.26" name="outline_width"/>
+              <Option type="QString" value="MM" name="outline_width_unit"/>
+              <Option type="QString" value="solid" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
@@ -32445,49 +32535,49 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem outlineWidthM="0.3,mm" groupUuid="" position="0,0,mm" positionLock="false" templateUuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" uuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" type="65638" blendMode="0" size="594,841,mm" opacity="1" visibility="1" referencePoint="0" id="" frame="false" zValue="0" frameJoinStyle="miter" positionOnPage="0,0,mm" background="true" excludeFromExports="0" itemRotation="0">
-          <FrameColor red="0" green="0" blue="0" alpha="255"/>
-          <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+        <LayoutItem referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" groupUuid="" positionOnPage="0,0,mm" positionLock="false" frameJoinStyle="miter" frame="false" type="65638" outlineWidthM="0.3,mm" templateUuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" background="true" size="594,841,mm" zValue="0" uuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" opacity="1" position="0,0,mm" excludeFromExports="0">
+          <FrameColor alpha="255" red="0" blue="0" green="0"/>
+          <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="255,255,255,255" type="QString" name="color"/>
-                <Option value="miter" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="255,255,255,255" name="color"/>
+                <Option type="QString" value="miter" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                <Option type="QString" value="no" name="outline_style"/>
+                <Option type="QString" value="0.26" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -32502,9 +32592,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -32512,15 +32602,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem rasterBorderWidth="0" outlineWidthM="0.3,mm" maxSymbolSize="0" rasterBorderColor="0,0,0,255" frameJoinStyle="miter" excludeFromExports="0" title="" columnCount="1" background="true" rasterBorder="1" boxSpace="2" size="4,4,mm" map_uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" legendFilterByAtlas="0" wmsLegendHeight="25" columnSpace="2" type="65642" symbolAlignment="1" id="" positionLock="true" blendMode="0" positionOnPage="25.5925,18.7971,mm" splitLayer="0" resizeToContents="1" templateUuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" frame="false" opacity="1" uuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" minSymbolSize="0" fontColor="#000000" lineSpacing="1" referencePoint="0" visibility="1" wrapChar="" itemRotation="0" symbolWidth="7" wmsLegendWidth="50" groupUuid="" position="25.5925,18.7971,mm" symbolHeight="4" equalColumnWidth="1" titleAlignment="1" zValue="8">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem splitLayer="0" size="4,4,mm" legendFilterByAtlas="0" boxSpace="2" templateUuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" blendMode="0" maxSymbolSize="0" position="25.5925,18.7971,mm" groupUuid="" wrapChar="" minSymbolSize="0" referencePoint="0" symbolAlignment="1" itemRotation="0" title="" equalColumnWidth="1" resizeToContents="1" wmsLegendHeight="25" columnCount="1" outlineWidthM="0.3,mm" rasterBorder="1" background="true" visibility="1" symbolHeight="4" fontColor="#000000" positionLock="true" zValue="8" titleAlignment="1" lineSpacing="1" columnSpace="2" id="" rasterBorderColor="0,0,0,255" positionOnPage="25.5925,18.7971,mm" excludeFromExports="0" rasterBorderWidth="0" type="65642" wmsLegendWidth="50" uuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" opacity="1" frame="false" symbolWidth="7" map_uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" frameJoinStyle="miter">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -32528,37 +32618,37 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style name="title" indent="0" alignment="1">
-            <styleFont bold="0" style="" italic="0" description="Myriad Pro,16,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0"/>
+          <style indent="0" alignment="1" name="title">
+            <styleFont style="" description="Myriad Pro,16,-1,5,50,0,0,0,0,0" strikethrough="0" italic="0" underline="0" bold="0"/>
           </style>
-          <style name="group" indent="0" alignment="1">
-            <styleFont bold="1" style="Semibold" italic="0" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" underline="0" strikethrough="0"/>
+          <style indent="0" alignment="1" name="group">
+            <styleFont style="Semibold" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0" italic="0" underline="0" bold="1"/>
           </style>
-          <style name="subgroup" indent="0" alignment="1" marginTop="1">
-            <styleFont bold="1" style="Semibold" italic="0" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" underline="0" strikethrough="0"/>
+          <style marginTop="1" indent="0" alignment="1" name="subgroup">
+            <styleFont style="Semibold" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0" italic="0" underline="0" bold="1"/>
           </style>
-          <style name="symbol" indent="0" alignment="1" marginTop="2">
-            <styleFont bold="0" style="" italic="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0"/>
+          <style marginTop="2" indent="0" alignment="1" name="symbol">
+            <styleFont style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0" strikethrough="0" italic="0" underline="0" bold="0"/>
           </style>
-          <style marginLeft="2" name="symbolLabel" indent="0" alignment="1" marginTop="2">
-            <styleFont bold="1" style="Semibold" italic="0" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" underline="0" strikethrough="0"/>
+          <style marginTop="2" marginLeft="2" indent="0" alignment="1" name="symbolLabel">
+            <styleFont style="Semibold" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0" italic="0" underline="0" bold="1"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group checked="Qt::Checked" name="Routes" groupLayer="" expanded="1">
+          <layer-tree-group expanded="1" groupLayer="" checked="Qt::Checked" name="Routes">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer checked="Qt::Checked" legend_exp="" name="all_routes" id="all_routes20170907054841602" legend_split_behavior="0" patch_size="0,0" expanded="1">
+            <layer-tree-layer id="all_routes20170907054841602" expanded="1" legend_split_behavior="0" legend_exp="" patch_size="0,0" checked="Qt::Checked" name="all_routes">
               <customproperties>
                 <Option type="Map">
-                  <Option value="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}" type="QString" name="expandedLegendNodes"/>
-                  <Option value="1,2,3" type="QString" name="legend/node-order"/>
-                  <Option value="hidden" type="QString" name="legend/title-style"/>
-                  <Option value="0" type="QString" name="showFeatureCount"/>
+                  <Option type="QString" value="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}" name="expandedLegendNodes"/>
+                  <Option type="QString" value="1,2,3" name="legend/node-order"/>
+                  <Option type="QString" value="hidden" name="legend/title-style"/>
+                  <Option type="QString" value="0" name="showFeatureCount"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -32566,47 +32656,47 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" valign="64" groupUuid="" position="5.2963,808.939,mm" positionLock="true" templateUuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" uuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" type="65641" blendMode="0" size="91.9494,15.0649,mm" opacity="1" visibility="1" htmlState="0" referencePoint="0" marginX="1" id="" halign="1" frame="false" zValue="7" labelText="MARSHAL POSITIONS" frameJoinStyle="miter" positionOnPage="5.2963,808.939,mm" background="false" marginY="1" excludeFromExports="0" itemRotation="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem marginY="1" referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" htmlState="0" groupUuid="" positionOnPage="5.2963,808.939,mm" positionLock="true" frameJoinStyle="miter" frame="false" type="65641" outlineWidthM="0.3,mm" templateUuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" background="false" size="91.9494,15.0649,mm" labelText="MARSHAL POSITIONS" zValue="7" uuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" opacity="1" position="5.2963,808.939,mm" marginX="1" halign="1" valign="64" excludeFromExports="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="63" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="1" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="12" namedStyle="" forcedItalic="0" fontSizeUnit="Point" allowHtml="0">
+        <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="" fontUnderline="0" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" fontWeight="63" fontStrikeout="0" fontItalic="0" fontSize="12" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferNoFill="1" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="1.5"/>
-          <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeBorderWidth="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <text-buffer bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
+            <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -32621,65 +32711,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" valign="32" groupUuid="" position="430.403,825.052,mm" positionLock="true" templateUuid="{16fde111-eb96-4679-a00f-a129be4e506a}" uuid="{16fde111-eb96-4679-a00f-a129be4e506a}" type="65641" blendMode="0" size="56.6212,15.3656,mm" opacity="1" visibility="1" htmlState="0" referencePoint="0" marginX="1" id="" halign="2" frame="false" zValue="5" labelText="REVISION 1.2" frameJoinStyle="miter" positionOnPage="430.403,825.052,mm" background="false" marginY="1" excludeFromExports="0" itemRotation="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem marginY="1" referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" htmlState="0" groupUuid="" positionOnPage="430.403,825.052,mm" positionLock="true" frameJoinStyle="miter" frame="false" type="65641" outlineWidthM="0.3,mm" templateUuid="{16fde111-eb96-4679-a00f-a129be4e506a}" background="false" size="56.6212,15.3656,mm" labelText="REVISION 1.2" zValue="5" uuid="{16fde111-eb96-4679-a00f-a129be4e506a}" opacity="1" position="430.403,825.052,mm" marginX="1" halign="2" valign="32" excludeFromExports="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="50" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="1" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="12" namedStyle="" forcedItalic="0" fontSizeUnit="Point" allowHtml="0">
+        <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="" fontUnderline="0" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" fontWeight="50" fontStrikeout="0" fontItalic="0" fontSize="12" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferNoFill="1" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="1.5"/>
-          <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeBorderWidth="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <text-buffer bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
+            <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -32694,65 +32784,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" valign="64" groupUuid="" position="372.175,808.942,mm" positionLock="true" templateUuid="{d177957c-7ab6-40ae-8769-347428500538}" uuid="{d177957c-7ab6-40ae-8769-347428500538}" type="65641" blendMode="0" size="114.848,15.0635,mm" opacity="1" visibility="1" htmlState="0" referencePoint="0" marginX="1" id="" halign="2" frame="false" zValue="4" labelText="Sunday, 20 October 2019" frameJoinStyle="miter" positionOnPage="372.175,808.942,mm" background="false" marginY="1" excludeFromExports="0" itemRotation="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem marginY="1" referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" htmlState="0" groupUuid="" positionOnPage="372.175,808.942,mm" positionLock="true" frameJoinStyle="miter" frame="false" type="65641" outlineWidthM="0.3,mm" templateUuid="{d177957c-7ab6-40ae-8769-347428500538}" background="false" size="114.848,15.0635,mm" labelText="Sunday, 20 October 2019" zValue="4" uuid="{d177957c-7ab6-40ae-8769-347428500538}" opacity="1" position="372.175,808.942,mm" marginX="1" halign="2" valign="64" excludeFromExports="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="50" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="1" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="12" namedStyle="" forcedItalic="0" fontSizeUnit="Point" allowHtml="0">
+        <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="" fontUnderline="0" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" fontWeight="50" fontStrikeout="0" fontItalic="0" fontSize="12" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferNoFill="1" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="1.5"/>
-          <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeBorderWidth="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <text-buffer bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
+            <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -32767,39 +32857,39 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" groupUuid="" position="489.557,775.395,mm" anchorPoint="8" positionLock="true" svgFillColor="255,255,255,255" templateUuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" uuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" type="65640" blendMode="0" size="100.498,63.9757,mm" opacity="1" visibility="1" svgBorderColor="0,0,0,255" northMode="0" northOffset="0" referencePoint="0" id="" frame="false" zValue="3" mode="1" frameJoinStyle="miter" resizeMode="0" positionOnPage="489.557,775.395,mm" file="../Gun_Run_Logo.png" svgBorderWidth="0.2" pictureRotation="0" background="false" pictureHeight="63.9757" pictureWidth="63.5856" excludeFromExports="0" itemRotation="0" mapUuid="">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" mapUuid="" svgBorderWidth="0.2" pictureHeight="63.9757" groupUuid="" positionOnPage="489.557,775.395,mm" positionLock="true" frameJoinStyle="miter" mode="1" frame="false" type="65640" outlineWidthM="0.3,mm" resizeMode="0" file="../Gun_Run_Logo.png" northOffset="0" templateUuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" background="false" svgFillColor="255,255,255,255" pictureRotation="0" size="100.498,63.9757,mm" zValue="3" uuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" svgBorderColor="0,0,0,255" northMode="0" opacity="1" position="489.557,775.395,mm" excludeFromExports="0" pictureWidth="63.5856" anchorPoint="8">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedSource">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -32807,42 +32897,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" groupUuid="" position="5.4463,824.155,mm" positionLock="true" templateUuid="{cc073cea-0811-4548-bfd7-924edac8690f}" uuid="{cc073cea-0811-4548-bfd7-924edac8690f}" type="65643" blendMode="0" size="481.428,0.606138,mm" opacity="1" visibility="1" referencePoint="0" id="" frame="false" zValue="2" shapeType="1" cornerRadiusMeasure="0,mm" frameJoinStyle="miter" positionOnPage="5.4463,824.155,mm" background="false" excludeFromExports="0" itemRotation="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" groupUuid="" positionOnPage="5.4463,824.155,mm" positionLock="true" frameJoinStyle="miter" frame="false" type="65643" outlineWidthM="0.3,mm" shapeType="1" cornerRadiusMeasure="0,mm" templateUuid="{cc073cea-0811-4548-bfd7-924edac8690f}" background="false" size="481.428,0.606138,mm" zValue="2" uuid="{cc073cea-0811-4548-bfd7-924edac8690f}" opacity="1" position="5.4463,824.155,mm" excludeFromExports="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+        <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="0,0,0,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="solid" type="QString" name="outline_style"/>
-              <Option value="0.3" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+              <Option type="QString" value="0,0,0,255" name="color"/>
+              <Option type="QString" value="miter" name="joinstyle"/>
+              <Option type="QString" value="0,0" name="offset"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+              <Option type="QString" value="MM" name="offset_unit"/>
+              <Option type="QString" value="0,0,0,255" name="outline_color"/>
+              <Option type="QString" value="solid" name="outline_style"/>
+              <Option type="QString" value="0.3" name="outline_width"/>
+              <Option type="QString" value="MM" name="outline_width_unit"/>
+              <Option type="QString" value="solid" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="0,0,0,255"/>
@@ -32857,90 +32947,90 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" groupUuid="" position="3.94474,5.25965,mm" positionLock="true" templateUuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" type="65639" blendMode="0" followPresetName="Marshal overview" keepLayerSet="false" size="584.759,811.213,mm" opacity="1" visibility="1" referencePoint="0" id="" frame="true" followPreset="true" zValue="1" frameJoinStyle="miter" labelMargin="0,mm" positionOnPage="3.94474,5.25965,mm" mapRotation="0" background="true" excludeFromExports="0" itemRotation="0" drawCanvasItems="false" mapFlags="0" isTemporal="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" drawCanvasItems="false" mapRotation="0" mapFlags="0" groupUuid="" positionOnPage="3.94474,5.25965,mm" positionLock="true" frameJoinStyle="miter" followPresetName="Marshal overview" frame="true" type="65639" outlineWidthM="0.3,mm" labelMargin="0,mm" templateUuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" background="true" size="584.759,811.213,mm" zValue="1" uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" opacity="1" position="3.94474,5.25965,mm" keepLayerSet="false" excludeFromExports="0" isTemporal="0" followPreset="true">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedMapScale">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="field"/>
-                  <Option value="2" type="int" name="type"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="" name="field"/>
+                  <Option type="int" value="2" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapXMin">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="field"/>
-                  <Option value="2" type="int" name="type"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="" name="field"/>
+                  <Option type="int" value="2" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapYMin">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="field"/>
-                  <Option value="2" type="int" name="type"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="" name="field"/>
+                  <Option type="int" value="2" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.37434415142052657" ymax="-33.89072661913806428" ymin="-33.95821655848814657" xmax="18.42299397558693741"/>
+        <Extent ymax="-33.89072661913806428" xmin="18.37434415142052657" ymin="-33.95821655848814657" xmax="18.42299397558693741"/>
         <LayerSet/>
-        <AtlasMap margin="0" atlasDriven="0" scalingMode="2"/>
+        <AtlasMap margin="0" scalingMode="2" atlasDriven="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" enabled="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clipSource="" enabled="0" clippingType="0"/>
+        <itemClippingSettings clipSource="" forceLabelsInside="0" clippingType="0" enabled="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" type="QString" name="atlasRasterFormat"/>
-          <Option value="0" type="QString" name="forceVector"/>
-          <Option value="0" type="QString" name="pdfDisableRasterTiles"/>
-          <Option value="1" type="QString" name="pdfIncludeMetadata"/>
-          <Option value="0" type="QString" name="pdfTextFormat"/>
+          <Option type="QString" value="png" name="atlasRasterFormat"/>
+          <Option type="QString" value="0" name="forceVector"/>
+          <Option type="QString" value="0" name="pdfDisableRasterTiles"/>
+          <Option type="QString" value="1" name="pdfIncludeMetadata"/>
+          <Option type="QString" value="0" name="pdfTextFormat"/>
         </Option>
       </customproperties>
-      <Atlas hideCoverage="1" pageNameExpression="&quot;page&quot;" sortFeatures="1" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" filenamePattern="'output_'||@atlas_featurenumber" coverageLayerName="complete_marshal_overview" sortAscending="1" filterFeatures="0" coverageLayer="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" sortKey="page" coverageLayerProvider="virtual" enabled="1"/>
+      <Atlas sortKey="page" sortAscending="1" filenamePattern="'output_'||@atlas_featurenumber" coverageLayer="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" filterFeatures="0" hideCoverage="1" enabled="1" coverageLayerProvider="virtual" pageNameExpression="&quot;page&quot;" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" coverageLayerName="complete_marshal_overview" sortFeatures="1"/>
     </Layout>
-    <Layout name="Access Roads" printResolution="144" worldFileMap="" units="mm">
-      <Snapper snapToItems="1" snapToGuides="1" tolerance="5" snapToGrid="0"/>
-      <Grid resUnits="mm" offsetUnits="mm" offsetY="0" offsetX="0" resolution="10"/>
+    <Layout units="mm" printResolution="144" worldFileMap="" name="Access Roads">
+      <Snapper snapToGuides="1" tolerance="5" snapToGrid="0" snapToItems="1"/>
+      <Grid resolution="10" offsetY="0" offsetX="0" offsetUnits="mm" resUnits="mm"/>
       <PageCollection>
-        <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+        <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="255,255,255,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="no" type="QString" name="outline_style"/>
-              <Option value="0.26" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+              <Option type="QString" value="255,255,255,255" name="color"/>
+              <Option type="QString" value="miter" name="joinstyle"/>
+              <Option type="QString" value="0,0" name="offset"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+              <Option type="QString" value="MM" name="offset_unit"/>
+              <Option type="QString" value="0,0,0,255" name="outline_color"/>
+              <Option type="QString" value="no" name="outline_style"/>
+              <Option type="QString" value="0.26" name="outline_width"/>
+              <Option type="QString" value="MM" name="outline_width_unit"/>
+              <Option type="QString" value="solid" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
@@ -32955,49 +33045,49 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem outlineWidthM="0.3,mm" groupUuid="" position="0,0,mm" positionLock="false" templateUuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" uuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" type="65638" blendMode="0" size="297,210,mm" opacity="1" visibility="1" referencePoint="0" id="" frame="false" zValue="0" frameJoinStyle="miter" positionOnPage="0,0,mm" background="true" excludeFromExports="0" itemRotation="0">
-          <FrameColor red="0" green="0" blue="0" alpha="255"/>
-          <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+        <LayoutItem referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" groupUuid="" positionOnPage="0,0,mm" positionLock="false" frameJoinStyle="miter" frame="false" type="65638" outlineWidthM="0.3,mm" templateUuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" background="true" size="297,210,mm" zValue="0" uuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" opacity="1" position="0,0,mm" excludeFromExports="0">
+          <FrameColor alpha="255" red="0" blue="0" green="0"/>
+          <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="255,255,255,255" type="QString" name="color"/>
-                <Option value="miter" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="255,255,255,255" name="color"/>
+                <Option type="QString" value="miter" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                <Option type="QString" value="no" name="outline_style"/>
+                <Option type="QString" value="0.26" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -33012,27 +33102,27 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide position="0" page="0" orientation="2" units="mm"/>
+          <Guide page="0" units="mm" orientation="2" position="0"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem rasterBorderWidth="0" outlineWidthM="0.3,mm" maxSymbolSize="0" rasterBorderColor="0,0,0,255" frameJoinStyle="miter" excludeFromExports="0" title="" columnCount="1" background="true" rasterBorder="1" boxSpace="2" size="34.45,40.8,mm" legendFilterByAtlas="0" wmsLegendHeight="25" columnSpace="2" type="65642" symbolAlignment="1" id="" positionLock="true" blendMode="0" positionOnPage="244.484,130.172,mm" splitLayer="0" resizeToContents="1" templateUuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" frame="true" opacity="1" uuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" minSymbolSize="0" fontColor="#000000" lineSpacing="1" referencePoint="0" visibility="1" wrapChar="" itemRotation="0" symbolWidth="7" wmsLegendWidth="50" groupUuid="" position="244.484,130.172,mm" symbolHeight="4" equalColumnWidth="0" titleAlignment="1" zValue="15">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="185"/>
+      <LayoutItem splitLayer="0" size="34.45,40.8,mm" legendFilterByAtlas="0" boxSpace="2" templateUuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" blendMode="0" maxSymbolSize="0" position="244.484,130.172,mm" groupUuid="" wrapChar="" minSymbolSize="0" referencePoint="0" symbolAlignment="1" itemRotation="0" title="" equalColumnWidth="0" resizeToContents="1" wmsLegendHeight="25" columnCount="1" outlineWidthM="0.3,mm" rasterBorder="1" background="true" visibility="1" symbolHeight="4" fontColor="#000000" positionLock="true" zValue="15" titleAlignment="1" lineSpacing="1" columnSpace="2" id="" rasterBorderColor="0,0,0,255" positionOnPage="244.484,130.172,mm" excludeFromExports="0" rasterBorderWidth="0" type="65642" wmsLegendWidth="50" uuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" opacity="1" frame="true" symbolWidth="7" frameJoinStyle="miter">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="185" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -33040,35 +33130,35 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style name="title" indent="0" alignment="1">
-            <styleFont bold="1" style="Semibold" italic="0" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" underline="0" strikethrough="0"/>
+          <style indent="0" alignment="1" name="title">
+            <styleFont style="Semibold" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0" italic="0" underline="0" bold="1"/>
           </style>
-          <style name="group" indent="0" alignment="1" marginTop="3">
-            <styleFont bold="1" style="Semibold" italic="0" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" underline="0" strikethrough="0"/>
+          <style marginTop="3" indent="0" alignment="1" name="group">
+            <styleFont style="Semibold" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0" italic="0" underline="0" bold="1"/>
           </style>
-          <style name="subgroup" indent="0" alignment="1" marginTop="3">
-            <styleFont bold="1" style="Semibold" italic="0" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" underline="0" strikethrough="0"/>
+          <style marginTop="3" indent="0" alignment="1" name="subgroup">
+            <styleFont style="Semibold" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0" italic="0" underline="0" bold="1"/>
           </style>
-          <style name="symbol" indent="0" alignment="1" marginTop="2.5">
-            <styleFont bold="0" style="" italic="0" description="Myriad Pro,9,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0"/>
+          <style marginTop="2.5" indent="0" alignment="1" name="symbol">
+            <styleFont style="" description="Myriad Pro,9,-1,5,50,0,0,0,0,0" strikethrough="0" italic="0" underline="0" bold="0"/>
           </style>
-          <style marginLeft="2" name="symbolLabel" indent="0" alignment="1" marginTop="2">
-            <styleFont bold="0" style="Regular" italic="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular" underline="0" strikethrough="0"/>
+          <style marginTop="2" marginLeft="2" indent="0" alignment="1" name="symbolLabel">
+            <styleFont style="Regular" description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular" strikethrough="0" italic="0" underline="0" bold="0"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group checked="Qt::Checked" name="Residents Access" groupLayer="" expanded="1">
+          <layer-tree-group expanded="1" groupLayer="" checked="Qt::Checked" name="Residents Access">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer checked="Qt::Checked" legend_exp="" source="./residents_access_roads.shp|layername=residents_access_roads" name="residents_access_roads" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" providerKey="ogr" legend_split_behavior="0" patch_size="0,0" expanded="1">
+            <layer-tree-layer id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" expanded="1" legend_split_behavior="0" source="./residents_access_roads.shp|layername=residents_access_roads" legend_exp="" providerKey="ogr" patch_size="0,0" checked="Qt::Checked" name="residents_access_roads">
               <customproperties>
                 <Option type="Map">
                   <Option type="invalid" name="expandedLegendNodes"/>
-                  <Option value="hidden" type="QString" name="legend/title-style"/>
+                  <Option type="QString" value="hidden" name="legend/title-style"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -33076,47 +33166,47 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" valign="64" groupUuid="" position="9.37446,191.81,mm" positionLock="true" templateUuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" uuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" type="65641" blendMode="0" size="194.851,7.272,mm" opacity="1" visibility="1" htmlState="0" referencePoint="0" marginX="0" id="" halign="1" frame="false" zValue="8" labelText="ACCESS ROUTES FOR RESIDENTS" frameJoinStyle="miter" positionOnPage="9.37446,191.81,mm" background="false" marginY="1" excludeFromExports="0" itemRotation="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem marginY="1" referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" htmlState="0" groupUuid="" positionOnPage="9.37446,191.81,mm" positionLock="true" frameJoinStyle="miter" frame="false" type="65641" outlineWidthM="0.3,mm" templateUuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" background="false" size="194.851,7.272,mm" labelText="ACCESS ROUTES FOR RESIDENTS" zValue="8" uuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" opacity="1" position="9.37446,191.81,mm" marginX="0" halign="1" valign="64" excludeFromExports="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="50" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="1" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="14" namedStyle="" forcedItalic="0" fontSizeUnit="Point" allowHtml="0">
+        <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="" fontUnderline="0" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" fontWeight="50" fontStrikeout="0" fontItalic="0" fontSize="14" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferNoFill="1" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="1.5"/>
-          <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeBorderWidth="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <text-buffer bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
+            <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -33131,65 +33221,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" valign="64" groupUuid="" position="204.225,191.81,mm" positionLock="true" templateUuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" uuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" type="65641" blendMode="0" size="57.4836,6.8714,mm" opacity="1" visibility="1" htmlState="0" referencePoint="0" marginX="1" id="" halign="2" frame="false" zValue="6" labelText="REVISION 1.1" frameJoinStyle="miter" positionOnPage="204.225,191.81,mm" background="false" marginY="1" excludeFromExports="0" itemRotation="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem marginY="1" referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" htmlState="0" groupUuid="" positionOnPage="204.225,191.81,mm" positionLock="true" frameJoinStyle="miter" frame="false" type="65641" outlineWidthM="0.3,mm" templateUuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" background="false" size="57.4836,6.8714,mm" labelText="REVISION 1.1" zValue="6" uuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" opacity="1" position="204.225,191.81,mm" marginX="1" halign="2" valign="64" excludeFromExports="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="50" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="1" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="12" namedStyle="" forcedItalic="0" fontSizeUnit="Point" allowHtml="0">
+        <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="" fontUnderline="0" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" fontWeight="50" fontStrikeout="0" fontItalic="0" fontSize="12" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferNoFill="1" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="1.5"/>
-          <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeBorderWidth="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <text-buffer bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
+            <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -33204,65 +33294,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" valign="64" groupUuid="" position="210.038,199.082,mm" positionLock="true" templateUuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" uuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" type="65641" blendMode="0" size="51.6706,6.60801,mm" opacity="1" visibility="1" htmlState="0" referencePoint="0" marginX="1" id="" halign="2" frame="false" zValue="5" labelText="Sunday, 20 October 2019" frameJoinStyle="miter" positionOnPage="210.038,199.082,mm" background="false" marginY="1" excludeFromExports="0" itemRotation="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem marginY="1" referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" htmlState="0" groupUuid="" positionOnPage="210.038,199.082,mm" positionLock="true" frameJoinStyle="miter" frame="false" type="65641" outlineWidthM="0.3,mm" templateUuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" background="false" size="51.6706,6.60801,mm" labelText="Sunday, 20 October 2019" zValue="5" uuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" opacity="1" position="210.038,199.082,mm" marginX="1" halign="2" valign="64" excludeFromExports="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="50" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="1" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="12" namedStyle="" forcedItalic="0" fontSizeUnit="Point" allowHtml="0">
+        <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="" fontUnderline="0" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" fontWeight="50" fontStrikeout="0" fontItalic="0" fontSize="12" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferNoFill="1" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="1.5"/>
-          <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeBorderWidth="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <text-buffer bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
+            <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -33277,39 +33367,39 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" groupUuid="" position="262.196,188.218,mm" anchorPoint="4" positionLock="true" svgFillColor="255,255,255,255" templateUuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" uuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" type="65640" blendMode="0" size="29.7523,17.4718,mm" opacity="1" visibility="1" svgBorderColor="0,0,0,255" northMode="0" northOffset="0" referencePoint="0" id="" frame="false" zValue="4" mode="1" frameJoinStyle="miter" resizeMode="0" positionOnPage="262.196,188.218,mm" file="../Gun_Run_Logo.png" svgBorderWidth="0.2" pictureRotation="0" background="false" pictureHeight="17.4718" pictureWidth="17.3653" excludeFromExports="0" itemRotation="0" mapUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" mapUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" svgBorderWidth="0.2" pictureHeight="17.4718" groupUuid="" positionOnPage="262.196,188.218,mm" positionLock="true" frameJoinStyle="miter" mode="1" frame="false" type="65640" outlineWidthM="0.3,mm" resizeMode="0" file="../Gun_Run_Logo.png" northOffset="0" templateUuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" background="false" svgFillColor="255,255,255,255" pictureRotation="0" size="29.7523,17.4718,mm" zValue="4" uuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" svgBorderColor="0,0,0,255" northMode="0" opacity="1" position="262.196,188.218,mm" excludeFromExports="0" pictureWidth="17.3653" anchorPoint="4">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedSource">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -33317,42 +33407,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" groupUuid="" position="9.59946,198.832,mm" positionLock="true" templateUuid="{01219eef-e96b-45c3-a449-5e0250541019}" uuid="{01219eef-e96b-45c3-a449-5e0250541019}" type="65643" blendMode="0" size="251.959,0.1,mm" opacity="1" visibility="1" referencePoint="0" id="" frame="false" zValue="3" shapeType="1" cornerRadiusMeasure="0,mm" frameJoinStyle="miter" positionOnPage="9.59946,198.832,mm" background="false" excludeFromExports="0" itemRotation="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" groupUuid="" positionOnPage="9.59946,198.832,mm" positionLock="true" frameJoinStyle="miter" frame="false" type="65643" outlineWidthM="0.3,mm" shapeType="1" cornerRadiusMeasure="0,mm" templateUuid="{01219eef-e96b-45c3-a449-5e0250541019}" background="false" size="251.959,0.1,mm" zValue="3" uuid="{01219eef-e96b-45c3-a449-5e0250541019}" opacity="1" position="9.59946,198.832,mm" excludeFromExports="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+        <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="0,0,0,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="solid" type="QString" name="outline_style"/>
-              <Option value="0.3" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+              <Option type="QString" value="0,0,0,255" name="color"/>
+              <Option type="QString" value="miter" name="joinstyle"/>
+              <Option type="QString" value="0,0" name="offset"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+              <Option type="QString" value="MM" name="offset_unit"/>
+              <Option type="QString" value="0,0,0,255" name="outline_color"/>
+              <Option type="QString" value="solid" name="outline_style"/>
+              <Option type="QString" value="0.3" name="outline_width"/>
+              <Option type="QString" value="MM" name="outline_width_unit"/>
+              <Option type="QString" value="solid" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="0,0,0,255"/>
@@ -33367,61 +33457,61 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" groupUuid="" position="5.86559,4.09761,mm" positionLock="true" templateUuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" uuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" type="65639" blendMode="0" followPresetName="Access Routes" keepLayerSet="false" size="67.7828,166.874,mm" opacity="1" visibility="1" referencePoint="0" id="" frame="true" followPreset="true" zValue="2" frameJoinStyle="miter" labelMargin="0,mm" positionOnPage="5.86559,4.09761,mm" mapRotation="0" background="true" excludeFromExports="0" itemRotation="0" drawCanvasItems="false" mapFlags="0" isTemporal="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" drawCanvasItems="false" mapRotation="0" mapFlags="0" groupUuid="" positionOnPage="5.86559,4.09761,mm" positionLock="true" frameJoinStyle="miter" followPresetName="Access Routes" frame="true" type="65639" outlineWidthM="0.3,mm" labelMargin="0,mm" templateUuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" background="true" size="67.7828,166.874,mm" zValue="2" uuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" opacity="1" position="5.86559,4.09761,mm" keepLayerSet="false" excludeFromExports="0" isTemporal="0" followPreset="true">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedMapScale">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;END" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapXMax">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.424'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.419'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.417'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.424'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.419'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.417'&#xa;END" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapXMin">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.3728857'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.3728857'&#xa;END" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapYMax">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.893'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.897'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.898'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.893'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.897'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.898'&#xa;END" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapYMin">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.9465293'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.9465293'&#xa;END" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedOpacity">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="1" type="int" name="type"/>
-                  <Option value="" type="QString" name="val"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="int" value="1" name="type"/>
+                  <Option type="QString" value="" name="val"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.37288570000000121" ymax="-33.91513741583252539" ymin="-33.94652930000000168" xmax="18.38563681624126289"/>
+        <Extent ymax="-33.91513741583252539" xmin="18.37288570000000121" ymin="-33.94652930000000168" xmax="18.38563681624126289"/>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
             <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
@@ -33436,45 +33526,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid show="0" rotatedTicksEnabled="0" gridFrameStyle="0" crossLength="3" gridFrameMargin="0" leftFrameDivisions="0" bottomFrameDivisions="0" gridFramePenThickness="0.5" topAnnotationDisplay="0" topAnnotationPosition="1" rotatedTicksMinimumAngle="0" name="Grid 1" showAnnotation="0" rotatedAnnotationsEnabled="0" rotatedTicksLengthMode="0" annotationExpression="" intervalX="0" bottomAnnotationPosition="1" rightAnnotationDisplay="0" rotatedAnnotationsMinimumAngle="0" annotationPrecision="3" frameFillColor1="255,255,255,255" blendMode="0" offsetY="0" gridFrameWidth="2" leftAnnotationDisplay="0" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" rotatedAnnotationsMarginToCorner="0" topFrameDivisions="0" topAnnotationDirection="0" rightAnnotationPosition="1" rotatedTicksMarginToCorner="0" gridStyle="0" minimumIntervalWidth="50" intervalY="0" unit="0" maximumIntervalWidth="100" gridFrameSideFlags="15" frameAnnotationDistance="1" frameFillColor2="0,0,0,255" rightAnnotationDirection="0" position="3" bottomAnnotationDisplay="0" leftAnnotationPosition="1" rotatedAnnotationsLengthMode="0" annotationFormat="0" gridFramePenColor="0,0,0,255" leftAnnotationDirection="0" rightFrameDivisions="0" bottomAnnotationDirection="0" offsetX="0">
+        <ComposerMapGrid bottomAnnotationPosition="1" frameFillColor2="0,0,0,255" blendMode="0" bottomAnnotationDisplay="0" name="Grid 1" frameFillColor1="255,255,255,255" position="3" bottomFrameDivisions="0" topAnnotationPosition="1" crossLength="3" leftAnnotationDisplay="0" intervalY="0" rotatedAnnotationsMarginToCorner="0" gridFrameStyle="0" annotationFormat="0" topAnnotationDirection="0" leftFrameDivisions="0" topFrameDivisions="0" annotationPrecision="3" rotatedTicksMinimumAngle="0" rightFrameDivisions="0" maximumIntervalWidth="100" unit="0" rotatedTicksEnabled="0" topAnnotationDisplay="0" leftAnnotationPosition="1" show="0" rotatedTicksMarginToCorner="0" rotatedTicksLengthMode="0" gridStyle="0" rotatedAnnotationsMinimumAngle="0" minimumIntervalWidth="50" bottomAnnotationDirection="0" annotationExpression="" intervalX="0" offsetY="0" offsetX="0" gridFramePenColor="0,0,0,255" gridFrameMargin="0" gridFrameWidth="2" rightAnnotationDisplay="0" rotatedAnnotationsEnabled="0" leftAnnotationDirection="0" rightAnnotationDirection="0" gridFrameSideFlags="15" gridFramePenThickness="0.5" showAnnotation="0" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" rightAnnotationPosition="1" frameAnnotationDistance="1" rotatedAnnotationsLengthMode="0">
           <lineStyle>
-            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0,0,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0,0,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -33505,44 +33595,44 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+              <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="angle"/>
-                  <Option value="square" type="QString" name="cap_style"/>
-                  <Option value="0,0,0,255" type="QString" name="color"/>
-                  <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="circle" type="QString" name="name"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                  <Option value="solid" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="diameter" type="QString" name="scale_method"/>
-                  <Option value="2" type="QString" name="size"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="size_unit"/>
-                  <Option value="1" type="QString" name="vertical_anchor_point"/>
+                  <Option type="QString" value="0" name="angle"/>
+                  <Option type="QString" value="square" name="cap_style"/>
+                  <Option type="QString" value="0,0,0,255" name="color"/>
+                  <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="circle" name="name"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                  <Option type="QString" value="solid" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="diameter" name="scale_method"/>
+                  <Option type="QString" value="2" name="size"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="size_unit"/>
+                  <Option type="QString" value="1" name="vertical_anchor_point"/>
                 </Option>
                 <prop k="angle" v="0"/>
                 <prop k="cap_style" v="square"/>
@@ -33565,40 +33655,40 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="50" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="1" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="10" namedStyle="" forcedItalic="0" fontSizeUnit="Point" allowHtml="0">
+          <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="" fontUnderline="0" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" fontWeight="50" fontStrikeout="0" fontItalic="0" fontSize="10" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" textOrientation="horizontal">
             <families/>
-            <text-buffer bufferNoFill="1" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="1.5"/>
-            <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeBorderWidth="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-              <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <text-buffer bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+            <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskType="0"/>
+            <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
+              <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                    <Option value="255,255,255,255" type="QString" name="color"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                    <Option value="no" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="solid" type="QString" name="style"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                    <Option type="QString" value="255,255,255,255" name="color"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                    <Option type="QString" value="no" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="solid" name="style"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -33613,29 +33703,29 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+            <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -33643,45 +33733,45 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap margin="0.05" atlasDriven="0" scalingMode="2"/>
+        <AtlasMap margin="0.05" scalingMode="2" atlasDriven="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" enabled="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clipSource="" enabled="0" clippingType="0"/>
+        <itemClippingSettings clipSource="" forceLabelsInside="0" clippingType="0" enabled="0"/>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.15,mm" groupUuid="" position="9.44946,9.08557,mm" positionLock="true" templateUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" uuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" type="65639" blendMode="0" followPresetName="Access Routes" keepLayerSet="false" size="282.012,175.592,mm" opacity="1" visibility="1" referencePoint="0" id="" frame="true" followPreset="true" zValue="1" frameJoinStyle="round" labelMargin="0,mm" positionOnPage="9.44946,9.08557,mm" mapRotation="0" background="true" excludeFromExports="0" itemRotation="0" drawCanvasItems="false" mapFlags="0" isTemporal="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" drawCanvasItems="false" mapRotation="0" mapFlags="0" groupUuid="" positionOnPage="9.44946,9.08557,mm" positionLock="true" frameJoinStyle="round" followPresetName="Access Routes" frame="true" type="65639" outlineWidthM="0.15,mm" labelMargin="0,mm" templateUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" background="true" size="282.012,175.592,mm" zValue="1" uuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" opacity="1" position="9.44946,9.08557,mm" keepLayerSet="false" excludeFromExports="0" isTemporal="0" followPreset="true">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedMapScale">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '10000'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '5500'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '10000'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '5500'&#xa;END" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapXMin">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.370'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.374'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.3975'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.370'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.374'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.3975'&#xa;END" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapYMin">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.930'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.923'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.912'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.930'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.923'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.912'&#xa;END" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.37000000000000099" ymax="-33.89697816224119009" ymin="-33.92999999999999972" xmax="18.42303507276415431"/>
+        <Extent ymax="-33.89697816224119009" xmin="18.37000000000000099" ymin="-33.92999999999999972" xmax="18.42303507276415431"/>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
             <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
@@ -33696,45 +33786,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid show="0" rotatedTicksEnabled="0" gridFrameStyle="0" crossLength="3" gridFrameMargin="0" leftFrameDivisions="0" bottomFrameDivisions="0" gridFramePenThickness="0.5" topAnnotationDisplay="0" topAnnotationPosition="1" rotatedTicksMinimumAngle="0" name="Grid 1" showAnnotation="0" rotatedAnnotationsEnabled="0" rotatedTicksLengthMode="0" annotationExpression="" intervalX="0" bottomAnnotationPosition="1" rightAnnotationDisplay="0" rotatedAnnotationsMinimumAngle="0" annotationPrecision="3" frameFillColor1="255,255,255,255" blendMode="0" offsetY="0" gridFrameWidth="2" leftAnnotationDisplay="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" rotatedAnnotationsMarginToCorner="0" topFrameDivisions="0" topAnnotationDirection="0" rightAnnotationPosition="1" rotatedTicksMarginToCorner="0" gridStyle="0" minimumIntervalWidth="50" intervalY="0" unit="0" maximumIntervalWidth="100" gridFrameSideFlags="15" frameAnnotationDistance="1" frameFillColor2="0,0,0,255" rightAnnotationDirection="0" position="3" bottomAnnotationDisplay="0" leftAnnotationPosition="1" rotatedAnnotationsLengthMode="0" annotationFormat="0" gridFramePenColor="0,0,0,255" leftAnnotationDirection="0" rightFrameDivisions="0" bottomAnnotationDirection="0" offsetX="0">
+        <ComposerMapGrid bottomAnnotationPosition="1" frameFillColor2="0,0,0,255" blendMode="0" bottomAnnotationDisplay="0" name="Grid 1" frameFillColor1="255,255,255,255" position="3" bottomFrameDivisions="0" topAnnotationPosition="1" crossLength="3" leftAnnotationDisplay="0" intervalY="0" rotatedAnnotationsMarginToCorner="0" gridFrameStyle="0" annotationFormat="0" topAnnotationDirection="0" leftFrameDivisions="0" topFrameDivisions="0" annotationPrecision="3" rotatedTicksMinimumAngle="0" rightFrameDivisions="0" maximumIntervalWidth="100" unit="0" rotatedTicksEnabled="0" topAnnotationDisplay="0" leftAnnotationPosition="1" show="0" rotatedTicksMarginToCorner="0" rotatedTicksLengthMode="0" gridStyle="0" rotatedAnnotationsMinimumAngle="0" minimumIntervalWidth="50" bottomAnnotationDirection="0" annotationExpression="" intervalX="0" offsetY="0" offsetX="0" gridFramePenColor="0,0,0,255" gridFrameMargin="0" gridFrameWidth="2" rightAnnotationDisplay="0" rotatedAnnotationsEnabled="0" leftAnnotationDirection="0" rightAnnotationDirection="0" gridFrameSideFlags="15" gridFramePenThickness="0.5" showAnnotation="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" rightAnnotationPosition="1" frameAnnotationDistance="1" rotatedAnnotationsLengthMode="0">
           <lineStyle>
-            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0,0,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0,0,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -33765,44 +33855,44 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+              <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="angle"/>
-                  <Option value="square" type="QString" name="cap_style"/>
-                  <Option value="0,0,0,255" type="QString" name="color"/>
-                  <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="circle" type="QString" name="name"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                  <Option value="solid" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="diameter" type="QString" name="scale_method"/>
-                  <Option value="2" type="QString" name="size"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="size_unit"/>
-                  <Option value="1" type="QString" name="vertical_anchor_point"/>
+                  <Option type="QString" value="0" name="angle"/>
+                  <Option type="QString" value="square" name="cap_style"/>
+                  <Option type="QString" value="0,0,0,255" name="color"/>
+                  <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="circle" name="name"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                  <Option type="QString" value="solid" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="diameter" name="scale_method"/>
+                  <Option type="QString" value="2" name="size"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="size_unit"/>
+                  <Option type="QString" value="1" name="vertical_anchor_point"/>
                 </Option>
                 <prop k="angle" v="0"/>
                 <prop k="cap_style" v="square"/>
@@ -33825,40 +33915,40 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="50" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="1" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="10" namedStyle="" forcedItalic="0" fontSizeUnit="Point" allowHtml="0">
+          <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="" fontUnderline="0" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" fontWeight="50" fontStrikeout="0" fontItalic="0" fontSize="10" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" textOrientation="horizontal">
             <families/>
-            <text-buffer bufferNoFill="1" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="1.5"/>
-            <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeBorderWidth="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-              <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <text-buffer bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+            <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskType="0"/>
+            <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
+              <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                    <Option value="255,255,255,255" type="QString" name="color"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                    <Option value="no" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="solid" type="QString" name="style"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                    <Option type="QString" value="255,255,255,255" name="color"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                    <Option type="QString" value="no" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="solid" name="style"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -33873,29 +33963,29 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+            <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -33903,56 +33993,56 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
+        <AtlasMap margin="0.10000000000000001" scalingMode="2" atlasDriven="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" enabled="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clipSource="" enabled="0" clippingType="0"/>
+        <itemClippingSettings clipSource="" forceLabelsInside="0" clippingType="0" enabled="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" type="QString" name="atlasRasterFormat"/>
-          <Option value="0" type="QString" name="forceVector"/>
-          <Option value="true" type="QString" name="imageAntialias"/>
-          <Option value="0" type="QString" name="imageCropMarginBottom"/>
-          <Option value="0" type="QString" name="imageCropMarginLeft"/>
-          <Option value="0" type="QString" name="imageCropMarginRight"/>
-          <Option value="0" type="QString" name="imageCropMarginTop"/>
-          <Option value="false" type="QString" name="imageCropToContents"/>
-          <Option value="0" type="QString" name="pdfDisableRasterTiles"/>
-          <Option value="1" type="QString" name="pdfIncludeMetadata"/>
-          <Option value="0" type="QString" name="pdfTextFormat"/>
-          <Option value="false" type="QString" name="singleFile"/>
+          <Option type="QString" value="png" name="atlasRasterFormat"/>
+          <Option type="QString" value="0" name="forceVector"/>
+          <Option type="QString" value="true" name="imageAntialias"/>
+          <Option type="QString" value="0" name="imageCropMarginBottom"/>
+          <Option type="QString" value="0" name="imageCropMarginLeft"/>
+          <Option type="QString" value="0" name="imageCropMarginRight"/>
+          <Option type="QString" value="0" name="imageCropMarginTop"/>
+          <Option type="QString" value="false" name="imageCropToContents"/>
+          <Option type="QString" value="0" name="pdfDisableRasterTiles"/>
+          <Option type="QString" value="1" name="pdfIncludeMetadata"/>
+          <Option type="QString" value="0" name="pdfTextFormat"/>
+          <Option type="QString" value="false" name="singleFile"/>
         </Option>
       </customproperties>
-      <Atlas hideCoverage="1" pageNameExpression="&quot;FID&quot;" sortFeatures="0" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" coverageLayerName="residents_access" filterFeatures="0" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" coverageLayerProvider="ogr" enabled="1"/>
+      <Atlas filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" filterFeatures="0" hideCoverage="1" enabled="1" coverageLayerProvider="ogr" pageNameExpression="&quot;FID&quot;" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" coverageLayerName="residents_access" sortFeatures="0"/>
     </Layout>
-    <Layout name="Golf Course Access" printResolution="144" worldFileMap="{1717b463-32cf-4d87-9f5a-0e8302026e12}" units="mm">
-      <Snapper snapToItems="1" snapToGuides="1" tolerance="5" snapToGrid="0"/>
-      <Grid resUnits="mm" offsetUnits="mm" offsetY="0" offsetX="0" resolution="10"/>
+    <Layout units="mm" printResolution="144" worldFileMap="{1717b463-32cf-4d87-9f5a-0e8302026e12}" name="Golf Course Access">
+      <Snapper snapToGuides="1" tolerance="5" snapToGrid="0" snapToItems="1"/>
+      <Grid resolution="10" offsetY="0" offsetX="0" offsetUnits="mm" resUnits="mm"/>
       <PageCollection>
-        <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+        <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="255,255,255,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="no" type="QString" name="outline_style"/>
-              <Option value="0.26" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+              <Option type="QString" value="255,255,255,255" name="color"/>
+              <Option type="QString" value="miter" name="joinstyle"/>
+              <Option type="QString" value="0,0" name="offset"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+              <Option type="QString" value="MM" name="offset_unit"/>
+              <Option type="QString" value="0,0,0,255" name="outline_color"/>
+              <Option type="QString" value="no" name="outline_style"/>
+              <Option type="QString" value="0.26" name="outline_width"/>
+              <Option type="QString" value="MM" name="outline_width_unit"/>
+              <Option type="QString" value="solid" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
@@ -33967,49 +34057,49 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem outlineWidthM="0.3,mm" groupUuid="" position="0,0,mm" positionLock="false" templateUuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" uuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" type="65638" blendMode="0" size="297,210,mm" opacity="1" visibility="1" referencePoint="0" id="" frame="false" zValue="0" frameJoinStyle="miter" positionOnPage="0,0,mm" background="true" excludeFromExports="0" itemRotation="0">
-          <FrameColor red="0" green="0" blue="0" alpha="255"/>
-          <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+        <LayoutItem referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" groupUuid="" positionOnPage="0,0,mm" positionLock="false" frameJoinStyle="miter" frame="false" type="65638" outlineWidthM="0.3,mm" templateUuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" background="true" size="297,210,mm" zValue="0" uuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" opacity="1" position="0,0,mm" excludeFromExports="0">
+          <FrameColor alpha="255" red="0" blue="0" green="0"/>
+          <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="255,255,255,255" type="QString" name="color"/>
-                <Option value="miter" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="255,255,255,255" name="color"/>
+                <Option type="QString" value="miter" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                <Option type="QString" value="no" name="outline_style"/>
+                <Option type="QString" value="0.26" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -34024,59 +34114,59 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide position="0" page="0" orientation="2" units="mm"/>
+          <Guide page="0" units="mm" orientation="2" position="0"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem outlineWidthM="0.3,mm" valign="64" groupUuid="" position="9.37446,191.81,mm" positionLock="true" templateUuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" uuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" type="65641" blendMode="0" size="194.851,7.272,mm" opacity="1" visibility="1" htmlState="0" referencePoint="0" marginX="0" id="" halign="1" frame="false" zValue="8" labelText="Access to P9 Parking and VIP Tent" frameJoinStyle="miter" positionOnPage="9.37446,191.81,mm" background="false" marginY="1" excludeFromExports="0" itemRotation="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem marginY="1" referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" htmlState="0" groupUuid="" positionOnPage="9.37446,191.81,mm" positionLock="true" frameJoinStyle="miter" frame="false" type="65641" outlineWidthM="0.3,mm" templateUuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" background="false" size="194.851,7.272,mm" labelText="Access to P9 Parking and VIP Tent" zValue="8" uuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" opacity="1" position="9.37446,191.81,mm" marginX="0" halign="1" valign="64" excludeFromExports="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="50" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="1" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="14" namedStyle="" forcedItalic="0" fontSizeUnit="Point" allowHtml="0">
+        <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="" fontUnderline="0" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" fontWeight="50" fontStrikeout="0" fontItalic="0" fontSize="14" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferNoFill="1" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="1.5"/>
-          <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeBorderWidth="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <text-buffer bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
+            <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -34091,65 +34181,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" valign="64" groupUuid="" position="204.225,191.81,mm" positionLock="true" templateUuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" uuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" type="65641" blendMode="0" size="57.4836,6.8714,mm" opacity="1" visibility="1" htmlState="0" referencePoint="0" marginX="1" id="" halign="2" frame="false" zValue="6" labelText="REVISION 1.0" frameJoinStyle="miter" positionOnPage="204.225,191.81,mm" background="false" marginY="1" excludeFromExports="0" itemRotation="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem marginY="1" referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" htmlState="0" groupUuid="" positionOnPage="204.225,191.81,mm" positionLock="true" frameJoinStyle="miter" frame="false" type="65641" outlineWidthM="0.3,mm" templateUuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" background="false" size="57.4836,6.8714,mm" labelText="REVISION 1.0" zValue="6" uuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" opacity="1" position="204.225,191.81,mm" marginX="1" halign="2" valign="64" excludeFromExports="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="50" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="1" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="12" namedStyle="" forcedItalic="0" fontSizeUnit="Point" allowHtml="0">
+        <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="" fontUnderline="0" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" fontWeight="50" fontStrikeout="0" fontItalic="0" fontSize="12" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferNoFill="1" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="1.5"/>
-          <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeBorderWidth="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <text-buffer bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
+            <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -34164,65 +34254,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" valign="64" groupUuid="" position="210.038,199.082,mm" positionLock="true" templateUuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" uuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" type="65641" blendMode="0" size="51.6706,6.60801,mm" opacity="1" visibility="1" htmlState="0" referencePoint="0" marginX="1" id="" halign="2" frame="false" zValue="5" labelText="Sunday, 20 October 2019" frameJoinStyle="miter" positionOnPage="210.038,199.082,mm" background="false" marginY="1" excludeFromExports="0" itemRotation="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem marginY="1" referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" htmlState="0" groupUuid="" positionOnPage="210.038,199.082,mm" positionLock="true" frameJoinStyle="miter" frame="false" type="65641" outlineWidthM="0.3,mm" templateUuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" background="false" size="51.6706,6.60801,mm" labelText="Sunday, 20 October 2019" zValue="5" uuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" opacity="1" position="210.038,199.082,mm" marginX="1" halign="2" valign="64" excludeFromExports="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="50" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="1" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="12" namedStyle="" forcedItalic="0" fontSizeUnit="Point" allowHtml="0">
+        <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="" fontUnderline="0" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" fontWeight="50" fontStrikeout="0" fontItalic="0" fontSize="12" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferNoFill="1" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="1.5"/>
-          <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeBorderWidth="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <text-buffer bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
+            <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -34237,39 +34327,39 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" groupUuid="" position="262.196,188.218,mm" anchorPoint="4" positionLock="true" svgFillColor="255,255,255,255" templateUuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" uuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" type="65640" blendMode="0" size="29.7523,17.4718,mm" opacity="1" visibility="1" svgBorderColor="0,0,0,255" northMode="0" northOffset="0" referencePoint="0" id="" frame="false" zValue="4" mode="1" frameJoinStyle="miter" resizeMode="0" positionOnPage="262.196,188.218,mm" file="../Gun_Run_Logo.png" svgBorderWidth="0.2" pictureRotation="0" background="false" pictureHeight="17.4718" pictureWidth="17.3653" excludeFromExports="0" itemRotation="0" mapUuid="">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" mapUuid="" svgBorderWidth="0.2" pictureHeight="17.4718" groupUuid="" positionOnPage="262.196,188.218,mm" positionLock="true" frameJoinStyle="miter" mode="1" frame="false" type="65640" outlineWidthM="0.3,mm" resizeMode="0" file="../Gun_Run_Logo.png" northOffset="0" templateUuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" background="false" svgFillColor="255,255,255,255" pictureRotation="0" size="29.7523,17.4718,mm" zValue="4" uuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" svgBorderColor="0,0,0,255" northMode="0" opacity="1" position="262.196,188.218,mm" excludeFromExports="0" pictureWidth="17.3653" anchorPoint="4">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedSource">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -34277,42 +34367,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" groupUuid="" position="9.59946,198.832,mm" positionLock="true" templateUuid="{6df60d25-1d7e-4e06-8988-483618276a67}" uuid="{6df60d25-1d7e-4e06-8988-483618276a67}" type="65643" blendMode="0" size="251.959,0.1,mm" opacity="1" visibility="1" referencePoint="0" id="" frame="false" zValue="3" shapeType="1" cornerRadiusMeasure="0,mm" frameJoinStyle="miter" positionOnPage="9.59946,198.832,mm" background="false" excludeFromExports="0" itemRotation="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" groupUuid="" positionOnPage="9.59946,198.832,mm" positionLock="true" frameJoinStyle="miter" frame="false" type="65643" outlineWidthM="0.3,mm" shapeType="1" cornerRadiusMeasure="0,mm" templateUuid="{6df60d25-1d7e-4e06-8988-483618276a67}" background="false" size="251.959,0.1,mm" zValue="3" uuid="{6df60d25-1d7e-4e06-8988-483618276a67}" opacity="1" position="9.59946,198.832,mm" excludeFromExports="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+        <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="0,0,0,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="solid" type="QString" name="outline_style"/>
-              <Option value="0.3" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+              <Option type="QString" value="0,0,0,255" name="color"/>
+              <Option type="QString" value="miter" name="joinstyle"/>
+              <Option type="QString" value="0,0" name="offset"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+              <Option type="QString" value="MM" name="offset_unit"/>
+              <Option type="QString" value="0,0,0,255" name="outline_color"/>
+              <Option type="QString" value="solid" name="outline_style"/>
+              <Option type="QString" value="0.3" name="outline_width"/>
+              <Option type="QString" value="MM" name="outline_width_unit"/>
+              <Option type="QString" value="solid" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="0,0,0,255"/>
@@ -34327,46 +34417,46 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.15,mm" groupUuid="" position="9.44946,7.25098,mm" positionLock="false" templateUuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" uuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" type="65639" blendMode="0" followPresetName="" keepLayerSet="false" size="282.012,182.649,mm" opacity="1" visibility="1" referencePoint="0" id="" frame="false" followPreset="false" zValue="1" frameJoinStyle="round" labelMargin="0,mm" positionOnPage="9.44946,7.25098,mm" mapRotation="0" background="true" excludeFromExports="0" itemRotation="0" drawCanvasItems="false" mapFlags="0" isTemporal="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" drawCanvasItems="false" mapRotation="0" mapFlags="0" groupUuid="" positionOnPage="9.44946,7.25098,mm" positionLock="false" frameJoinStyle="round" followPresetName="" frame="false" type="65639" outlineWidthM="0.15,mm" labelMargin="0,mm" templateUuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" background="true" size="282.012,182.649,mm" zValue="1" uuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" opacity="1" position="9.44946,7.25098,mm" keepLayerSet="false" excludeFromExports="0" isTemporal="0" followPreset="false">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedMapScale">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '10000'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '5500'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '10000'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '5500'&#xa;END" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapXMin">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.370'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.374'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.3975'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.370'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.374'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.3975'&#xa;END" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapYMin">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.930'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.923'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.912'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.930'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.923'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.912'&#xa;END" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.40103928699269886" ymax="-33.90319854486631357" ymin="-33.90848231674397084" xmax="18.40919746780259914"/>
+        <Extent ymax="-33.90319854486631357" xmin="18.40103928699269886" ymin="-33.90848231674397084" xmax="18.40919746780259914"/>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
             <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
@@ -34381,45 +34471,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid show="0" rotatedTicksEnabled="0" gridFrameStyle="0" crossLength="3" gridFrameMargin="0" leftFrameDivisions="0" bottomFrameDivisions="0" gridFramePenThickness="0.5" topAnnotationDisplay="0" topAnnotationPosition="1" rotatedTicksMinimumAngle="0" name="Grid 1" showAnnotation="0" rotatedAnnotationsEnabled="0" rotatedTicksLengthMode="0" annotationExpression="" intervalX="0" bottomAnnotationPosition="1" rightAnnotationDisplay="0" rotatedAnnotationsMinimumAngle="0" annotationPrecision="3" frameFillColor1="255,255,255,255" blendMode="0" offsetY="0" gridFrameWidth="2" leftAnnotationDisplay="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" rotatedAnnotationsMarginToCorner="0" topFrameDivisions="0" topAnnotationDirection="0" rightAnnotationPosition="1" rotatedTicksMarginToCorner="0" gridStyle="0" minimumIntervalWidth="50" intervalY="0" unit="0" maximumIntervalWidth="100" gridFrameSideFlags="15" frameAnnotationDistance="1" frameFillColor2="0,0,0,255" rightAnnotationDirection="0" position="3" bottomAnnotationDisplay="0" leftAnnotationPosition="1" rotatedAnnotationsLengthMode="0" annotationFormat="0" gridFramePenColor="0,0,0,255" leftAnnotationDirection="0" rightFrameDivisions="0" bottomAnnotationDirection="0" offsetX="0">
+        <ComposerMapGrid bottomAnnotationPosition="1" frameFillColor2="0,0,0,255" blendMode="0" bottomAnnotationDisplay="0" name="Grid 1" frameFillColor1="255,255,255,255" position="3" bottomFrameDivisions="0" topAnnotationPosition="1" crossLength="3" leftAnnotationDisplay="0" intervalY="0" rotatedAnnotationsMarginToCorner="0" gridFrameStyle="0" annotationFormat="0" topAnnotationDirection="0" leftFrameDivisions="0" topFrameDivisions="0" annotationPrecision="3" rotatedTicksMinimumAngle="0" rightFrameDivisions="0" maximumIntervalWidth="100" unit="0" rotatedTicksEnabled="0" topAnnotationDisplay="0" leftAnnotationPosition="1" show="0" rotatedTicksMarginToCorner="0" rotatedTicksLengthMode="0" gridStyle="0" rotatedAnnotationsMinimumAngle="0" minimumIntervalWidth="50" bottomAnnotationDirection="0" annotationExpression="" intervalX="0" offsetY="0" offsetX="0" gridFramePenColor="0,0,0,255" gridFrameMargin="0" gridFrameWidth="2" rightAnnotationDisplay="0" rotatedAnnotationsEnabled="0" leftAnnotationDirection="0" rightAnnotationDirection="0" gridFrameSideFlags="15" gridFramePenThickness="0.5" showAnnotation="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" rightAnnotationPosition="1" frameAnnotationDistance="1" rotatedAnnotationsLengthMode="0">
           <lineStyle>
-            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0,0,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0,0,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -34450,44 +34540,44 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+              <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="angle"/>
-                  <Option value="square" type="QString" name="cap_style"/>
-                  <Option value="0,0,0,255" type="QString" name="color"/>
-                  <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="circle" type="QString" name="name"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                  <Option value="solid" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="diameter" type="QString" name="scale_method"/>
-                  <Option value="2" type="QString" name="size"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="size_unit"/>
-                  <Option value="1" type="QString" name="vertical_anchor_point"/>
+                  <Option type="QString" value="0" name="angle"/>
+                  <Option type="QString" value="square" name="cap_style"/>
+                  <Option type="QString" value="0,0,0,255" name="color"/>
+                  <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="circle" name="name"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                  <Option type="QString" value="solid" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="diameter" name="scale_method"/>
+                  <Option type="QString" value="2" name="size"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="size_unit"/>
+                  <Option type="QString" value="1" name="vertical_anchor_point"/>
                 </Option>
                 <prop k="angle" v="0"/>
                 <prop k="cap_style" v="square"/>
@@ -34510,40 +34600,40 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="50" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="1" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="10" namedStyle="" forcedItalic="0" fontSizeUnit="Point" allowHtml="0">
+          <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="" fontUnderline="0" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" fontWeight="50" fontStrikeout="0" fontItalic="0" fontSize="10" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" textOrientation="horizontal">
             <families/>
-            <text-buffer bufferNoFill="1" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="1.5"/>
-            <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeBorderWidth="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-              <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <text-buffer bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+            <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskType="0"/>
+            <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
+              <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                    <Option value="255,255,255,255" type="QString" name="color"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                    <Option value="no" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="solid" type="QString" name="style"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                    <Option type="QString" value="255,255,255,255" name="color"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                    <Option type="QString" value="no" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="solid" name="style"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -34558,29 +34648,29 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+            <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -34588,56 +34678,56 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
+        <AtlasMap margin="0.10000000000000001" scalingMode="2" atlasDriven="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" enabled="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clipSource="" enabled="0" clippingType="0"/>
+        <itemClippingSettings clipSource="" forceLabelsInside="0" clippingType="0" enabled="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" type="QString" name="atlasRasterFormat"/>
-          <Option value="0" type="QString" name="forceVector"/>
-          <Option value="true" type="QString" name="imageAntialias"/>
-          <Option value="0" type="QString" name="imageCropMarginBottom"/>
-          <Option value="0" type="QString" name="imageCropMarginLeft"/>
-          <Option value="0" type="QString" name="imageCropMarginRight"/>
-          <Option value="0" type="QString" name="imageCropMarginTop"/>
-          <Option value="false" type="QString" name="imageCropToContents"/>
-          <Option value="0" type="QString" name="pdfDisableRasterTiles"/>
-          <Option value="1" type="QString" name="pdfIncludeMetadata"/>
-          <Option value="0" type="QString" name="pdfTextFormat"/>
-          <Option value="false" type="QString" name="singleFile"/>
+          <Option type="QString" value="png" name="atlasRasterFormat"/>
+          <Option type="QString" value="0" name="forceVector"/>
+          <Option type="QString" value="true" name="imageAntialias"/>
+          <Option type="QString" value="0" name="imageCropMarginBottom"/>
+          <Option type="QString" value="0" name="imageCropMarginLeft"/>
+          <Option type="QString" value="0" name="imageCropMarginRight"/>
+          <Option type="QString" value="0" name="imageCropMarginTop"/>
+          <Option type="QString" value="false" name="imageCropToContents"/>
+          <Option type="QString" value="0" name="pdfDisableRasterTiles"/>
+          <Option type="QString" value="1" name="pdfIncludeMetadata"/>
+          <Option type="QString" value="0" name="pdfTextFormat"/>
+          <Option type="QString" value="false" name="singleFile"/>
         </Option>
       </customproperties>
-      <Atlas hideCoverage="1" pageNameExpression="&quot;FID&quot;" sortFeatures="0" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" coverageLayerName="residents_access" filterFeatures="0" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" coverageLayerProvider="ogr" enabled="0"/>
+      <Atlas filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" filterFeatures="0" hideCoverage="1" enabled="0" coverageLayerProvider="ogr" pageNameExpression="&quot;FID&quot;" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" coverageLayerName="residents_access" sortFeatures="0"/>
     </Layout>
-    <Layout name="Marshal Plan" printResolution="120" worldFileMap="" units="mm">
-      <Snapper snapToItems="1" snapToGuides="1" tolerance="5" snapToGrid="0"/>
-      <Grid resUnits="mm" offsetUnits="mm" offsetY="0" offsetX="0" resolution="10"/>
+    <Layout units="mm" printResolution="120" worldFileMap="" name="Marshal Plan">
+      <Snapper snapToGuides="1" tolerance="5" snapToGrid="0" snapToItems="1"/>
+      <Grid resolution="10" offsetY="0" offsetX="0" offsetUnits="mm" resUnits="mm"/>
       <PageCollection>
-        <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+        <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="255,255,255,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="no" type="QString" name="outline_style"/>
-              <Option value="0.26" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+              <Option type="QString" value="255,255,255,255" name="color"/>
+              <Option type="QString" value="miter" name="joinstyle"/>
+              <Option type="QString" value="0,0" name="offset"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+              <Option type="QString" value="MM" name="offset_unit"/>
+              <Option type="QString" value="0,0,0,255" name="outline_color"/>
+              <Option type="QString" value="no" name="outline_style"/>
+              <Option type="QString" value="0.26" name="outline_width"/>
+              <Option type="QString" value="MM" name="outline_width_unit"/>
+              <Option type="QString" value="solid" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
@@ -34652,49 +34742,49 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem outlineWidthM="0.3,mm" groupUuid="" position="0,0,mm" positionLock="false" templateUuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" uuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" type="65638" blendMode="0" size="297,420,mm" opacity="1" visibility="1" referencePoint="0" id="" frame="false" zValue="0" frameJoinStyle="miter" positionOnPage="0,0,mm" background="true" excludeFromExports="0" itemRotation="0">
-          <FrameColor red="0" green="0" blue="0" alpha="255"/>
-          <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+        <LayoutItem referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" groupUuid="" positionOnPage="0,0,mm" positionLock="false" frameJoinStyle="miter" frame="false" type="65638" outlineWidthM="0.3,mm" templateUuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" background="true" size="297,420,mm" zValue="0" uuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" opacity="1" position="0,0,mm" excludeFromExports="0">
+          <FrameColor alpha="255" red="0" blue="0" green="0"/>
+          <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="255,255,255,255" type="QString" name="color"/>
-                <Option value="miter" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="255,255,255,255" name="color"/>
+                <Option type="QString" value="miter" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                <Option type="QString" value="no" name="outline_style"/>
+                <Option type="QString" value="0.26" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -34709,9 +34799,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -34719,47 +34809,47 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem outlineWidthM="0.3,mm" valign="32" groupUuid="" position="112.086,406.476,mm" positionLock="true" templateUuid="{e80a7a81-88a9-4e36-a24b-3fc8125e32e9}" uuid="{e80a7a81-88a9-4e36-a24b-3fc8125e32e9}" type="65641" blendMode="0" size="23.5967,8.3142,mm" opacity="1" visibility="1" htmlState="1" referencePoint="0" marginX="0" id="" halign="4" frame="false" zValue="14" labelText="Page [% &quot;page&quot; %] " frameJoinStyle="miter" positionOnPage="112.086,406.476,mm" background="false" marginY="1" excludeFromExports="0" itemRotation="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem marginY="1" referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" htmlState="1" groupUuid="" positionOnPage="112.086,406.476,mm" positionLock="true" frameJoinStyle="miter" frame="false" type="65641" outlineWidthM="0.3,mm" templateUuid="{e80a7a81-88a9-4e36-a24b-3fc8125e32e9}" background="false" size="23.5967,8.3142,mm" labelText="Page [% &quot;page&quot; %] " zValue="14" uuid="{e80a7a81-88a9-4e36-a24b-3fc8125e32e9}" opacity="1" position="112.086,406.476,mm" marginX="0" halign="4" valign="32" excludeFromExports="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="50" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="1" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="12" namedStyle="" forcedItalic="0" fontSizeUnit="Point" allowHtml="0">
+        <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="" fontUnderline="0" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" fontWeight="50" fontStrikeout="0" fontItalic="0" fontSize="12" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferNoFill="1" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="1.5"/>
-          <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeBorderWidth="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <text-buffer bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
+            <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -34774,33 +34864,33 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem rasterBorderWidth="0" outlineWidthM="0.3,mm" maxSymbolSize="0" rasterBorderColor="0,0,0,255" frameJoinStyle="miter" excludeFromExports="0" title="" columnCount="1" background="true" rasterBorder="1" boxSpace="2" size="21.6797,33,mm" map_uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" legendFilterByAtlas="0" wmsLegendHeight="25" columnSpace="2" type="65642" symbolAlignment="1" id="" positionLock="true" blendMode="0" positionOnPage="15.6525,12.5708,mm" splitLayer="0" resizeToContents="1" templateUuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" frame="false" opacity="1" uuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" minSymbolSize="0" fontColor="#000000" lineSpacing="1" referencePoint="0" visibility="1" wrapChar="" itemRotation="0" symbolWidth="7" wmsLegendWidth="50" groupUuid="" position="15.6525,12.5708,mm" symbolHeight="4" equalColumnWidth="1" titleAlignment="1" zValue="8">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem splitLayer="0" size="21.6797,33,mm" legendFilterByAtlas="0" boxSpace="2" templateUuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" blendMode="0" maxSymbolSize="0" position="15.6525,12.5708,mm" groupUuid="" wrapChar="" minSymbolSize="0" referencePoint="0" symbolAlignment="1" itemRotation="0" title="" equalColumnWidth="1" resizeToContents="1" wmsLegendHeight="25" columnCount="1" outlineWidthM="0.3,mm" rasterBorder="1" background="true" visibility="1" symbolHeight="4" fontColor="#000000" positionLock="true" zValue="8" titleAlignment="1" lineSpacing="1" columnSpace="2" id="" rasterBorderColor="0,0,0,255" positionOnPage="15.6525,12.5708,mm" excludeFromExports="0" rasterBorderWidth="0" type="65642" wmsLegendWidth="50" uuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" opacity="1" frame="false" symbolWidth="7" map_uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" frameJoinStyle="miter">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -34808,37 +34898,37 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style name="title" indent="0" alignment="1">
-            <styleFont bold="0" style="" italic="0" description="Myriad Pro,16,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0"/>
+          <style indent="0" alignment="1" name="title">
+            <styleFont style="" description="Myriad Pro,16,-1,5,50,0,0,0,0,0" strikethrough="0" italic="0" underline="0" bold="0"/>
           </style>
-          <style name="group" indent="0" alignment="1">
-            <styleFont bold="1" style="Semibold" italic="0" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" underline="0" strikethrough="0"/>
+          <style indent="0" alignment="1" name="group">
+            <styleFont style="Semibold" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0" italic="0" underline="0" bold="1"/>
           </style>
-          <style name="subgroup" indent="0" alignment="1" marginTop="1">
-            <styleFont bold="1" style="Semibold" italic="0" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" underline="0" strikethrough="0"/>
+          <style marginTop="1" indent="0" alignment="1" name="subgroup">
+            <styleFont style="Semibold" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0" italic="0" underline="0" bold="1"/>
           </style>
-          <style name="symbol" indent="0" alignment="1" marginTop="2">
-            <styleFont bold="0" style="" italic="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0"/>
+          <style marginTop="2" indent="0" alignment="1" name="symbol">
+            <styleFont style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0" strikethrough="0" italic="0" underline="0" bold="0"/>
           </style>
-          <style marginLeft="2" name="symbolLabel" indent="0" alignment="1" marginTop="2">
-            <styleFont bold="1" style="Semibold" italic="0" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" underline="0" strikethrough="0"/>
+          <style marginTop="2" marginLeft="2" indent="0" alignment="1" name="symbolLabel">
+            <styleFont style="Semibold" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0" italic="0" underline="0" bold="1"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group checked="Qt::Checked" name="Routes" groupLayer="" expanded="1">
+          <layer-tree-group expanded="1" groupLayer="" checked="Qt::Checked" name="Routes">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer checked="Qt::Checked" legend_exp="" source="./all_routes.shp|layername=all_routes" name="all_routes" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" providerKey="ogr" legend_split_behavior="0" patch_size="0,0" expanded="1">
+            <layer-tree-layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" expanded="1" legend_split_behavior="0" source="./all_routes.shp|layername=all_routes" legend_exp="" providerKey="ogr" patch_size="0,0" checked="Qt::Checked" name="all_routes">
               <customproperties>
                 <Option type="Map">
                   <Option type="invalid" name="expandedLegendNodes"/>
-                  <Option value="1,2,3,4" type="QString" name="legend/node-order"/>
-                  <Option value="hidden" type="QString" name="legend/title-style"/>
-                  <Option value="0" type="int" name="showFeatureCount"/>
+                  <Option type="QString" value="1,2,3,4" name="legend/node-order"/>
+                  <Option type="QString" value="hidden" name="legend/title-style"/>
+                  <Option type="int" value="0" name="showFeatureCount"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -34846,47 +34936,47 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" valign="64" groupUuid="" position="5.69321,398.344,mm" positionLock="true" templateUuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" uuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" type="65641" blendMode="0" size="45.1194,8.13137,mm" opacity="1" visibility="1" htmlState="0" referencePoint="0" marginX="0" id="" halign="1" frame="false" zValue="7" labelText="MARSHAL POSITIONS" frameJoinStyle="miter" positionOnPage="5.69321,398.344,mm" background="false" marginY="1" excludeFromExports="0" itemRotation="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem marginY="1" referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" htmlState="0" groupUuid="" positionOnPage="5.69321,398.344,mm" positionLock="true" frameJoinStyle="miter" frame="false" type="65641" outlineWidthM="0.3,mm" templateUuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" background="false" size="45.1194,8.13137,mm" labelText="MARSHAL POSITIONS" zValue="7" uuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" opacity="1" position="5.69321,398.344,mm" marginX="0" halign="1" valign="64" excludeFromExports="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="63" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="1" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="12" namedStyle="" forcedItalic="0" fontSizeUnit="Point" allowHtml="0">
+        <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="" fontUnderline="0" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" fontWeight="63" fontStrikeout="0" fontItalic="0" fontSize="12" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferNoFill="1" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="1.5"/>
-          <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeBorderWidth="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <text-buffer bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
+            <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -34901,65 +34991,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" valign="32" groupUuid="" position="5.69321,406.988,mm" positionLock="true" templateUuid="{e68b6800-4c3f-494c-8bb8-5995b9419664}" uuid="{e68b6800-4c3f-494c-8bb8-5995b9419664}" type="65641" blendMode="0" size="118.192,7.80192,mm" opacity="1" visibility="1" htmlState="1" referencePoint="0" marginX="0" id="" halign="1" frame="false" zValue="6" 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>" frameJoinStyle="miter" positionOnPage="5.69321,406.988,mm" background="false" marginY="1" excludeFromExports="0" itemRotation="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem marginY="1" referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" htmlState="1" groupUuid="" positionOnPage="5.69321,406.988,mm" positionLock="true" frameJoinStyle="miter" frame="false" type="65641" outlineWidthM="0.3,mm" templateUuid="{e68b6800-4c3f-494c-8bb8-5995b9419664}" background="false" size="118.192,7.80192,mm" 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>" zValue="6" uuid="{e68b6800-4c3f-494c-8bb8-5995b9419664}" opacity="1" position="5.69321,406.988,mm" marginX="0" halign="1" valign="32" excludeFromExports="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="50" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="1" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="12" namedStyle="" forcedItalic="0" fontSizeUnit="Point" allowHtml="0">
+        <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="" fontUnderline="0" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" fontWeight="50" fontStrikeout="0" fontItalic="0" fontSize="12" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferNoFill="1" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="1.5"/>
-          <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeBorderWidth="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <text-buffer bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
+            <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -34974,65 +35064,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" valign="32" groupUuid="" position="214.292,406.874,mm" positionLock="true" templateUuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" uuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" type="65641" blendMode="0" size="27.7839,7.51682,mm" opacity="1" visibility="1" htmlState="0" referencePoint="0" marginX="0" id="" halign="2" frame="false" zValue="5" labelText="REVISION 3.0" frameJoinStyle="miter" positionOnPage="214.292,406.874,mm" background="false" marginY="1" excludeFromExports="0" itemRotation="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem marginY="1" referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" htmlState="0" groupUuid="" positionOnPage="214.292,406.874,mm" positionLock="true" frameJoinStyle="miter" frame="false" type="65641" outlineWidthM="0.3,mm" templateUuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" background="false" size="27.7839,7.51682,mm" labelText="REVISION 3.0" zValue="5" uuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" opacity="1" position="214.292,406.874,mm" marginX="0" halign="2" valign="32" excludeFromExports="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="50" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="1" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="12" namedStyle="" forcedItalic="0" fontSizeUnit="Point" allowHtml="0">
+        <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="" fontUnderline="0" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" fontWeight="50" fontStrikeout="0" fontItalic="0" fontSize="12" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferNoFill="1" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="1.5"/>
-          <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeBorderWidth="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <text-buffer bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
+            <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -35047,65 +35137,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" valign="64" groupUuid="" position="148.501,398.344,mm" positionLock="true" templateUuid="{dff19ea3-9875-466a-9e36-833d5f362e9c}" uuid="{dff19ea3-9875-466a-9e36-833d5f362e9c}" type="65641" blendMode="0" size="93.5757,8.13167,mm" opacity="1" visibility="1" htmlState="1" referencePoint="0" marginX="0" id="" halign="2" frame="false" zValue="4" 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>" frameJoinStyle="miter" positionOnPage="148.501,398.344,mm" background="false" marginY="1" excludeFromExports="0" itemRotation="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem marginY="1" referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" htmlState="1" groupUuid="" positionOnPage="148.501,398.344,mm" positionLock="true" frameJoinStyle="miter" frame="false" type="65641" outlineWidthM="0.3,mm" templateUuid="{dff19ea3-9875-466a-9e36-833d5f362e9c}" background="false" size="93.5757,8.13167,mm" 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>" zValue="4" uuid="{dff19ea3-9875-466a-9e36-833d5f362e9c}" opacity="1" position="148.501,398.344,mm" marginX="0" halign="2" valign="64" excludeFromExports="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="50" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="1" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="12" namedStyle="" forcedItalic="0" fontSizeUnit="Point" allowHtml="0">
+        <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="" fontUnderline="0" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" fontWeight="50" fontStrikeout="0" fontItalic="0" fontSize="12" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferNoFill="1" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="1.5"/>
-          <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeBorderWidth="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <text-buffer bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
+            <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -35120,39 +35210,39 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" groupUuid="" position="243.319,382.696,mm" anchorPoint="8" positionLock="true" svgFillColor="255,255,255,255" templateUuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" uuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" type="65640" blendMode="0" size="49.3143,31.2967,mm" opacity="1" visibility="1" svgBorderColor="0,0,0,255" northMode="0" northOffset="0" referencePoint="0" id="" frame="false" zValue="3" mode="1" frameJoinStyle="miter" resizeMode="0" positionOnPage="243.319,382.696,mm" file="../GunRun2022_250.png" svgBorderWidth="0.2" pictureRotation="0" background="false" pictureHeight="26.4325" pictureWidth="49.3143" excludeFromExports="0" itemRotation="0" mapUuid="">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" mapUuid="" svgBorderWidth="0.2" pictureHeight="26.4325" groupUuid="" positionOnPage="243.319,382.696,mm" positionLock="true" frameJoinStyle="miter" mode="1" frame="false" type="65640" outlineWidthM="0.3,mm" resizeMode="0" file="../GunRun2022_250.png" northOffset="0" templateUuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" background="false" svgFillColor="255,255,255,255" pictureRotation="0" size="49.3143,31.2967,mm" zValue="3" uuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" svgBorderColor="0,0,0,255" northMode="0" opacity="1" position="243.319,382.696,mm" excludeFromExports="0" pictureWidth="49.3143" anchorPoint="8">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedSource">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -35160,42 +35250,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" groupUuid="" position="5.84321,406.626,mm" positionLock="true" templateUuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" uuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" type="65643" blendMode="0" size="236.083,0.14328,mm" opacity="1" visibility="1" referencePoint="0" id="" frame="false" zValue="2" shapeType="1" cornerRadiusMeasure="0,mm" frameJoinStyle="miter" positionOnPage="5.84321,406.626,mm" background="false" excludeFromExports="0" itemRotation="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" groupUuid="" positionOnPage="5.84321,406.626,mm" positionLock="true" frameJoinStyle="miter" frame="false" type="65643" outlineWidthM="0.3,mm" shapeType="1" cornerRadiusMeasure="0,mm" templateUuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" background="false" size="236.083,0.14328,mm" zValue="2" uuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" opacity="1" position="5.84321,406.626,mm" excludeFromExports="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+        <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="0,0,0,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="solid" type="QString" name="outline_style"/>
-              <Option value="0.3" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+              <Option type="QString" value="0,0,0,255" name="color"/>
+              <Option type="QString" value="miter" name="joinstyle"/>
+              <Option type="QString" value="0,0" name="offset"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+              <Option type="QString" value="MM" name="offset_unit"/>
+              <Option type="QString" value="0,0,0,255" name="outline_color"/>
+              <Option type="QString" value="solid" name="outline_style"/>
+              <Option type="QString" value="0.3" name="outline_width"/>
+              <Option type="QString" value="MM" name="outline_width_unit"/>
+              <Option type="QString" value="solid" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="0,0,0,255"/>
@@ -35210,78 +35300,78 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" groupUuid="" position="5.03,5.9483,mm" positionLock="true" templateUuid="{8ff439cd-f9a2-4318-a778-a55335437202}" uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" type="65639" blendMode="0" followPresetName="Marshal overview" keepLayerSet="false" size="286.94,392.396,mm" opacity="1" visibility="1" referencePoint="0" id="" frame="false" followPreset="true" zValue="1" frameJoinStyle="miter" labelMargin="0,mm" positionOnPage="5.03,5.9483,mm" mapRotation="0" background="true" excludeFromExports="0" itemRotation="0" drawCanvasItems="false" mapFlags="0" isTemporal="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" drawCanvasItems="false" mapRotation="0" mapFlags="0" groupUuid="" positionOnPage="5.03,5.9483,mm" positionLock="true" frameJoinStyle="miter" followPresetName="Marshal overview" frame="false" type="65639" outlineWidthM="0.3,mm" labelMargin="0,mm" templateUuid="{8ff439cd-f9a2-4318-a778-a55335437202}" background="true" size="286.94,392.396,mm" zValue="1" uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" opacity="1" position="5.03,5.9483,mm" keepLayerSet="false" excludeFromExports="0" isTemporal="0" followPreset="true">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedMapScale">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="field"/>
-                  <Option value="2" type="int" name="type"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="" name="field"/>
+                  <Option type="int" value="2" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapXMin">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="field"/>
-                  <Option value="2" type="int" name="type"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="" name="field"/>
+                  <Option type="int" value="2" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapYMin">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="field"/>
-                  <Option value="2" type="int" name="type"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="" name="field"/>
+                  <Option type="int" value="2" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.36924763341120581" ymax="-33.9248732774534929" ymin="-33.94797288016832226" xmax="18.38613924055453452"/>
+        <Extent ymax="-33.9248732774534929" xmin="18.36924763341120581" ymin="-33.94797288016832226" xmax="18.38613924055453452"/>
         <LayerSet/>
-        <AtlasMap margin="0" atlasDriven="1" scalingMode="2"/>
+        <AtlasMap margin="0" scalingMode="2" atlasDriven="1"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" enabled="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clipSource="" enabled="0" clippingType="0"/>
+        <itemClippingSettings clipSource="" forceLabelsInside="0" clippingType="0" enabled="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" type="QString" name="atlasRasterFormat"/>
-          <Option value="0" type="int" name="forceVector"/>
-          <Option value="1" type="int" name="pdfAppendGeoreference"/>
-          <Option value="0" type="int" name="pdfCreateGeoPdf"/>
-          <Option value="0" type="int" name="pdfDisableRasterTiles"/>
-          <Option value="" type="QString" name="pdfExportThemes"/>
-          <Option value="1" type="int" name="pdfIncludeMetadata"/>
-          <Option value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~fence_groups_cbaea960_3348_4aea_b155_46e5d310f792~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~route_markers_7b072d1e_ad75_4233_a306_a6e83facfea1~~~route_markers_bb6f2b45_4e2f_4147_bb52_e7db21fcb1e7" type="QString" name="pdfLayerOrder"/>
-          <Option value="0" type="int" name="pdfLosslessImages"/>
-          <Option value="0" type="int" name="pdfOgcBestPracticeFormat"/>
-          <Option value="1" type="int" name="pdfSimplify"/>
-          <Option value="0" type="int" name="pdfTextFormat"/>
+          <Option type="QString" value="png" name="atlasRasterFormat"/>
+          <Option type="int" value="0" name="forceVector"/>
+          <Option type="int" value="1" name="pdfAppendGeoreference"/>
+          <Option type="int" value="0" name="pdfCreateGeoPdf"/>
+          <Option type="int" value="0" name="pdfDisableRasterTiles"/>
+          <Option type="QString" value="" name="pdfExportThemes"/>
+          <Option type="int" value="1" name="pdfIncludeMetadata"/>
+          <Option type="QString" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~fence_groups_cbaea960_3348_4aea_b155_46e5d310f792~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~route_markers_7b072d1e_ad75_4233_a306_a6e83facfea1~~~route_markers_bb6f2b45_4e2f_4147_bb52_e7db21fcb1e7" name="pdfLayerOrder"/>
+          <Option type="int" value="0" name="pdfLosslessImages"/>
+          <Option type="int" value="0" name="pdfOgcBestPracticeFormat"/>
+          <Option type="int" value="1" name="pdfSimplify"/>
+          <Option type="int" value="0" name="pdfTextFormat"/>
         </Option>
       </customproperties>
-      <Atlas hideCoverage="1" pageNameExpression="&quot;page&quot;" sortFeatures="1" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/marshal overviews.shp|layername=marshal overviews" filenamePattern="'output_'||@atlas_featurenumber" coverageLayerName="marshal_overviews" sortAscending="1" filterFeatures="0" coverageLayer="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" sortKey="page" coverageLayerProvider="ogr" enabled="1"/>
+      <Atlas sortKey="page" sortAscending="1" filenamePattern="'output_'||@atlas_featurenumber" coverageLayer="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" filterFeatures="0" hideCoverage="1" enabled="1" coverageLayerProvider="ogr" pageNameExpression="&quot;page&quot;" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/marshal overviews.shp|layername=marshal overviews" coverageLayerName="marshal_overviews" sortFeatures="1"/>
     </Layout>
   </Layouts>
   <mapViewDocks3D/>
   <Bookmarks/>
   <ProjectViewSettings UseProjectScales="0">
     <Scales/>
-    <DefaultViewExtent xmin="18.39483932596524696" ymax="-33.90119829484044089" ymin="-33.91746432349552265" xmax="18.42507820360838267">
+    <DefaultViewExtent ymax="-33.90225422560713753" xmin="18.35917421026181984" ymin="-33.94563030202068887" xmax="18.43981121731019357">
       <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>
@@ -35295,41 +35385,41 @@ def my_form_open(dialog, layer, feature):
       </spatialrefsys>
     </DefaultViewExtent>
   </ProjectViewSettings>
-  <ProjectStyleSettings projectStyleId="attachment:///QnVUUv_styles.db" RandomizeDefaultSymbolColor="1" DefaultSymbolOpacity="1">
+  <ProjectStyleSettings RandomizeDefaultSymbolColor="1" DefaultSymbolOpacity="1" projectStyleId="attachment:///QnVUUv_styles.db">
     <databases/>
   </ProjectStyleSettings>
-  <ProjectTimeSettings cumulativeTemporalRange="0" timeStepUnit="h" timeStep="1" frameRate="1"/>
+  <ProjectTimeSettings timeStepUnit="h" cumulativeTemporalRange="0" timeStep="1" frameRate="1"/>
   <ElevationProperties>
     <terrainProvider type="flat">
-      <TerrainProvider scale="1" offset="0"/>
+      <TerrainProvider offset="0" scale="1"/>
     </terrainProvider>
   </ElevationProperties>
   <ProjectDisplaySettings>
     <BearingFormat id="bearing">
       <Option type="Map">
-        <Option value="" type="QChar" name="decimal_separator"/>
-        <Option value="6" type="int" name="decimals"/>
-        <Option value="0" type="int" name="direction_format"/>
-        <Option value="0" type="int" name="rounding_type"/>
-        <Option value="false" type="bool" name="show_plus"/>
-        <Option value="true" type="bool" name="show_thousand_separator"/>
-        <Option value="false" type="bool" name="show_trailing_zeros"/>
-        <Option value="" type="QChar" name="thousand_separator"/>
+        <Option type="QChar" value="" name="decimal_separator"/>
+        <Option type="int" value="6" name="decimals"/>
+        <Option type="int" value="0" name="direction_format"/>
+        <Option type="int" value="0" name="rounding_type"/>
+        <Option type="bool" value="false" name="show_plus"/>
+        <Option type="bool" value="true" name="show_thousand_separator"/>
+        <Option type="bool" value="false" name="show_trailing_zeros"/>
+        <Option type="QChar" value="" name="thousand_separator"/>
       </Option>
     </BearingFormat>
     <GeographicCoordinateFormat id="geographiccoordinate">
       <Option type="Map">
-        <Option value="DecimalDegrees" type="QString" name="angle_format"/>
-        <Option value="" type="QChar" name="decimal_separator"/>
-        <Option value="6" type="int" name="decimals"/>
-        <Option value="0" type="int" name="rounding_type"/>
-        <Option value="false" type="bool" name="show_leading_degree_zeros"/>
-        <Option value="false" type="bool" name="show_leading_zeros"/>
-        <Option value="false" type="bool" name="show_plus"/>
-        <Option value="false" type="bool" name="show_suffix"/>
-        <Option value="true" type="bool" name="show_thousand_separator"/>
-        <Option value="false" type="bool" name="show_trailing_zeros"/>
-        <Option value="" type="QChar" name="thousand_separator"/>
+        <Option type="QString" value="DecimalDegrees" name="angle_format"/>
+        <Option type="QChar" value="" name="decimal_separator"/>
+        <Option type="int" value="6" name="decimals"/>
+        <Option type="int" value="0" name="rounding_type"/>
+        <Option type="bool" value="false" name="show_leading_degree_zeros"/>
+        <Option type="bool" value="false" name="show_leading_zeros"/>
+        <Option type="bool" value="false" name="show_plus"/>
+        <Option type="bool" value="false" name="show_suffix"/>
+        <Option type="bool" value="true" name="show_thousand_separator"/>
+        <Option type="bool" value="false" name="show_trailing_zeros"/>
+        <Option type="QChar" value="" name="thousand_separator"/>
       </Option>
     </GeographicCoordinateFormat>
   </ProjectDisplaySettings>
diff --git a/GIS Base Map/Gun Run.qgs.mldata b/GIS Base Map/Gun Run.qgs.mldata
index 41846cc557390fdc8c7caa27d43d56f40b3e6ad3..04418997ca31f18b42ce69973b6b88d508be0b3a 100644
GIT binary patch
delta 2003
zcma)-e^69a6vyAPwETMS?FtL%uDkpOdAV_U?hY;@z61k_l5#ZEoCO4bB%4TP3=;@6
z!`PJKbohq^1w;_}Vc;-W32l^AR7kSo5Hur^QDmh9sKGRKc9Z|!)83o=e%$l9=bm%!
z_r3dLZcY9PbCQwDq0AIdWl_8FYN9N7H&Fyn3uVM!6TVxVRwHs2Y}t4c>@iX?XwAgu
zU6i?_Bwg+kt2FgcEfhs5DB+^5^ZUa0n&3D2h-kmvRlL9F3BvSFt{T3T!wdE+xBOaR
zC%qObA`}qlwpG+qqk?0FmxEliI3hIKvpQ-Pluxdg#NT$~n31>xOOEg6g?-iY69r&%
zs}gmb>%M~FPCjVt+QSPW6?1tlQ0IOoQY1;t*ae&OP*CfdC#TEI?;i%MhlW0AwX;Jw
z{)&xL!<cs})Y9A3p~)U0hkouv9t-u^VEXOa$P`HR92Ga1y@tgNfiz(z3uFB%_wmA(
zW2NK{ma1ADWf+eA#agb|h@rgOH=Jg0)F=*4EK^7aG|LdW$r5W>$mWFy-@2-Sur=b|
zCs;yXJ8o|X+Qkd2&l_0KDJ953C1Hy851t**<b|fcKH6LlUMh)@KUNVYd+B%bTy(1U
zdTwe6Vl@fU(VkmE7^5w@=Lo7memk;Q2N7B)t`n;^mfpEyGPtSrhcT6kZ8`nYbOB1@
zg}%&^rWt4>@r%`YjDrKw0ZiS6y!LOfw3@17@6S;sNsD8-M^5e(z`76T2A}>REzuzt
zxa!@ZHl--ar<zOuQ-^&Z#nQXxC{+54iW^GR5{6fOIp&B-8Q+8IIQ!PtU#CzV31AD|
zrW2cBu^=vRLE#IdDsQ&l{6|j1E4<({pEUN#qFgMG8T>aB!Pe@#%nSQ@;r?cCA9fBt
zb#v&<A|8FzQjSsWtmqCyKK%J-hGIakbOtGo`z<3ZF{k#IVot3il|LoS0<Bu_NJ^ZS
zYdCt3m0V_VZEn06PyuF5jW{{2A@rZ;Vhlql_Tqw-uS2+2g1n(6tbL@)>WR8c|AN08
zHTO^~5-IjCC#>2~oSm43DasPdSKou`Xot8Y_%0oxYm=jz-pJsE+~)iFa94L)Jmv;H
zVba=H1kWIuQJ*udg$eyBaTEdwZQgLGt{2faQ%~K2s{s;D%K{1AI@^6|0LfKFJKCT(
zP=Y)dMCi2HuT~n6{IcfKO=t^}ATxpqlXBkwWGj-5Wn6d&)C5Zex+#Rv%Xe(*_yDWb
zr?y^$cS0nb#)lHx|8jB3IIhFJJl9Sr43!`aVH~4K-*WwT{52%a={@ElJ4|AFzi^`O
z?|w=vN5Kr3*6xj)5o|L2HaxLWuDC%)L!IBTjgS0-ki<=3U?QnqT{!6&C;JBvy!*-=
zuGTEHZ;#rGJIb^9MTZ~$D=ggq@c6ahzP&H-49HwHj4`e`&W<r&e=RGv0mi*IT&#!~
GX8#3?=CXSL

delta 1771
zcmaKte^69a6vr<hyQuFj3JVGD0t@2iOYHjM$5ObwkpyzUng$S>a&1{yOv^w5nlT4v
zv_LClkH5eWY8hb1Hrs41YKSG%A!)P;v&f;W8L>fJM#C}Iw9ex6-+TOV=e>8&=bU@)
z`JQ`Ud(|J?_NV7qND48Ka*{??<47hZVkW7?LKwa!lQNtw#Ww?fm*K1lpO#rJl{|)?
zX0()&7fGtCzBnjc-`Dfnn}-P@3L>8TXgI&|%yzgQbV(yIk5C{ELSR#*9_9siOFH)l
zGg^>&*F9b)h}%Ei(&&U2xHWL)Q3b>)izGd|6+E>@N7%LK(btk)w+hA-t&(JulBd=7
zojxcR#9vxFPrLyhr8K!M<YBrLc0BckRS?e^Kk4s<_e1O}=GqkQOF=Rn-&GC%s+okB
z=SOo3D_aK7qkmgHjKB$X9&~agYTa;6{`}6ASy~+2?0V~o@@mLiFe+_GUpOLdh~pTo
z+8DlR-xfivUj4js3aj*<G)gH?J?zx(Tudb_Yhz&&mS>GkZPH4mf_cqq6acYNdhY6t
zqcc8>Aa)G(W&l&QOE2)digCo5RH`c##B1HpWrH?UhCCn2RHnVP-`+F}V&d^9d!D%s
zEi40bkq-RjB1WAoBzG^S;A}STF@s8zC11tf#f<L0@2xqD>i*Dl_+2k*mV?3hIXC)1
zw^L{Djb!ez_;mxj+NDnZXLMDdQ20Qmi@PQxy@`6Lh!~YN6h_Jz);`43{0ld)xlpEt
z14oXHqfA*~)RsucS+Rss$LWBnu9pOH*TEZlk6$X-A7zrpBcqtgxxTp0w^a}a^kJ#0
z+c2oikmrM<dD`|iElEUvk#)K{4Prv)$Yvs%sggVgv<;a2k7dJ-tZBbm^5K74%5zU2
z9q>|Yv{$;E094a1o%mN8#(l3_-+Tdut$0=W8TjPL<61@!-U>D>z}|ZNPHh2$KeflC
zgSN#mE@@@o^(<_zwLkA1g-bCV(qvOC<AyG8O{v{1h_>{OAvhB&L)OJHs+f8G&@CkY
zK7Bbw1MWDP<*ho#@j1T9engEQ6byh}Clj<No^k#4(~k@zDLg9_gDqZ$T$jMO-td1v
zUx}pon}L1MkRU@QFJttcE!X-Xl8qZ2U&lk`GMPjZ5*ar+6Q1wFI$h!Nn!%JP6Eti&
z<J^4-31e9N%BdwgV8e15GC<GMca(0O7q8&oN_reKV9?7fKcQ#TQ<LXz#V%=|D9TRr
zpHhEQ@lt2*|NF>)DdF{cZp`>sYT$hcm={gQ?^G<lh(T;gcf~IFSiKH^5=~GO5q9z_
HZ&3XQx}0dq

diff --git a/GIS Base Map/Gun Run.qgs~ b/GIS Base Map/Gun Run.qgs~
index ba39103..d03b8d5 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 version="3.26.2-Buenos Aires" projectname="Gun Run" saveUserFull="Timothy Allen" saveDateTime="2022-09-04T18:41:18" saveUser="tim">
+<qgis saveUser="tim" saveDateTime="2022-09-06T15:22:23" version="3.26.2-Buenos Aires" saveUserFull="Timothy Allen" projectname="Gun Run">
   <homePath path=""/>
   <title>Gun Run</title>
   <transaction mode="Disabled"/>
@@ -21,215 +21,215 @@
     <customproperties>
       <Option/>
     </customproperties>
-    <layer-tree-group checked="Qt::Unchecked" name="Marshals" groupLayer="" expanded="1">
+    <layer-tree-group expanded="1" groupLayer="" checked="Qt::Unchecked" name="Marshals">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer checked="Qt::Unchecked" legend_exp="" source="./marshal_positions.shp|layername=marshal_positions" name="marshal_positions" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" providerKey="ogr" legend_split_behavior="0" patch_size="0,0" expanded="1">
+      <layer-tree-layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" expanded="1" legend_split_behavior="0" source="./marshal_positions.shp|layername=marshal_positions" legend_exp="" providerKey="ogr" patch_size="0,0" checked="Qt::Unchecked" name="marshal_positions">
         <customproperties>
           <Option type="Map">
-            <Option value="marshal_positions" type="QString" name="cached_name"/>
+            <Option type="QString" value="marshal_positions" name="cached_name"/>
             <Option type="invalid" name="expandedLegendNodes"/>
-            <Option value="" type="QString" name="legend/expressionFilter"/>
-            <Option value="false" type="QString" name="legend/expressionFilterEnabled"/>
-            <Option value="1" type="int" name="showFeatureCount"/>
+            <Option type="QString" value="" name="legend/expressionFilter"/>
+            <Option type="QString" value="false" name="legend/expressionFilterEnabled"/>
+            <Option type="int" value="1" name="showFeatureCount"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer checked="Qt::Unchecked" legend_exp="" source="./extra_security.shp" name="extra_security" id="extra_security20170921130834191" providerKey="ogr" legend_split_behavior="0" patch_size="0,0" expanded="1">
+      <layer-tree-layer id="extra_security20170921130834191" expanded="1" legend_split_behavior="0" source="./extra_security.shp" legend_exp="" providerKey="ogr" patch_size="0,0" checked="Qt::Unchecked" name="extra_security">
         <customproperties>
           <Option type="Map">
             <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer checked="Qt::Unchecked" legend_exp="" source="./marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes" name="marshals_by_position" id="marshals_by_position20161003112326575" providerKey="delimitedtext" legend_split_behavior="0" patch_size="0,0" expanded="1">
+      <layer-tree-layer id="marshals_by_position20161003112326575" expanded="1" legend_split_behavior="0" source="./marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes" legend_exp="" providerKey="delimitedtext" patch_size="0,0" checked="Qt::Unchecked" name="marshals_by_position">
         <customproperties>
           <Option type="Map">
-            <Option value="marshals_by_position" type="QString" name="cached_name"/>
+            <Option type="QString" value="marshals_by_position" name="cached_name"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer checked="Qt::Unchecked" legend_exp="" source="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" name="complete_marshal_overview" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" providerKey="virtual" legend_split_behavior="0" patch_size="0,0" expanded="1">
+      <layer-tree-layer id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" expanded="1" legend_split_behavior="0" source="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" legend_exp="" providerKey="virtual" patch_size="0,0" checked="Qt::Unchecked" name="complete_marshal_overview">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer checked="Qt::Unchecked" legend_exp="" source="./marshal overviews.shp|layername=marshal overviews" name="marshal_overviews" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" providerKey="ogr" legend_split_behavior="0" patch_size="0,0" expanded="0">
+      <layer-tree-layer id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" expanded="0" legend_split_behavior="0" source="./marshal overviews.shp|layername=marshal overviews" legend_exp="" providerKey="ogr" patch_size="0,0" checked="Qt::Unchecked" name="marshal_overviews">
         <customproperties>
           <Option type="Map">
-            <Option value="" type="QString" name="legend/expressionFilter"/>
-            <Option value="false" type="QString" name="legend/expressionFilterEnabled"/>
+            <Option type="QString" value="" name="legend/expressionFilter"/>
+            <Option type="QString" value="false" name="legend/expressionFilterEnabled"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group checked="Qt::Unchecked" name="Fencing and Cones" groupLayer="" expanded="1">
+    <layer-tree-group expanded="1" groupLayer="" checked="Qt::Unchecked" name="Fencing and Cones">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer checked="Qt::Unchecked" legend_exp="" source="./fencing.shp|layername=fencing" name="fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" providerKey="ogr" legend_split_behavior="0" patch_size="0,0" expanded="1">
+      <layer-tree-layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" expanded="1" legend_split_behavior="0" source="./fencing.shp|layername=fencing" legend_exp="" providerKey="ogr" patch_size="0,0" checked="Qt::Unchecked" name="fencing">
         <customproperties>
           <Option type="Map">
-            <Option value="fencing" type="QString" name="cached_name"/>
-            <Option value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" type="QString" name="expandedLegendNodes"/>
-            <Option value="" type="QString" name="legend/expressionFilter"/>
-            <Option value="false" type="QString" name="legend/expressionFilterEnabled"/>
+            <Option type="QString" value="fencing" name="cached_name"/>
+            <Option type="QString" value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" name="expandedLegendNodes"/>
+            <Option type="QString" value="" name="legend/expressionFilter"/>
+            <Option type="QString" value="false" name="legend/expressionFilterEnabled"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer checked="Qt::Unchecked" legend_exp="" source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20SUM(cone_len)%20AS%20[cone_len],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22" name="fence_groups" id="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792" providerKey="virtual" legend_split_behavior="0" patch_size="0,0" expanded="1">
+      <layer-tree-layer id="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792" expanded="1" legend_split_behavior="0" source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20SUM(cone_len)%20AS%20[cone_len],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22" legend_exp="" providerKey="virtual" patch_size="0,0" checked="Qt::Unchecked" name="fence_groups">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group checked="Qt::Checked" name="Routes" groupLayer="" expanded="1">
+    <layer-tree-group expanded="1" groupLayer="" checked="Qt::Checked" name="Routes">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-group checked="Qt::Checked" name="Markers" groupLayer="" expanded="1">
+      <layer-tree-group expanded="1" groupLayer="" checked="Qt::Checked" name="Markers">
         <customproperties>
           <Option/>
         </customproperties>
-        <layer-tree-layer checked="Qt::Unchecked" legend_exp="" source="Point?crs=EPSG:4326&amp;uid={05790416-d753-49b1-9e87-b3ddb34a215c}" name="route_markers" id="route_markers_d58f7174_b6d0_4e1c_80ed_0d74635b8ca6" providerKey="memory" legend_split_behavior="0" patch_size="-1,-1" expanded="1">
+        <layer-tree-layer id="route_markers_4e92bf25_f500_4b5f_bf49_9dd0b475a0c9" expanded="1" legend_split_behavior="0" source="Point?crs=EPSG:4326&amp;uid={4808c362-f7ac-4282-ac6f-84be4cb842e6}" legend_exp="" providerKey="memory" patch_size="-1,-1" checked="Qt::Checked" name="route_markers">
           <customproperties>
             <Option type="Map">
-              <Option value="1" type="int" name="showFeatureCount"/>
+              <Option type="int" value="1" name="showFeatureCount"/>
             </Option>
           </customproperties>
         </layer-tree-layer>
       </layer-tree-group>
-      <layer-tree-layer checked="Qt::Checked" legend_exp="" source="./all_routes.shp|layername=all_routes" name="all_routes" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" providerKey="ogr" legend_split_behavior="0" patch_size="0,0" expanded="1">
+      <layer-tree-layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" expanded="1" legend_split_behavior="0" source="./all_routes.shp|layername=all_routes" legend_exp="" providerKey="ogr" patch_size="0,0" checked="Qt::Checked" name="all_routes">
         <customproperties>
           <Option type="Map">
-            <Option value="all_routes" type="QString" name="cached_name"/>
-            <Option name="expandedLegendNodes"/>
-            <Option value="0" type="int" name="showFeatureCount"/>
+            <Option type="QString" value="all_routes" name="cached_name"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
+            <Option type="int" value="0" name="showFeatureCount"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-layer checked="Qt::Unchecked" legend_exp="" source="./timelapse.shp|layername=timelapse|subset=&quot;first_runn&quot; &lt; '06:59:45.000000' AND &quot;last_runne&quot; >= '06:59:35.000000' " name="timelapse" id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" providerKey="ogr" legend_split_behavior="0" patch_size="0,0" expanded="0">
+    <layer-tree-layer id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" expanded="0" legend_split_behavior="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' " legend_exp="" providerKey="ogr" patch_size="0,0" checked="Qt::Unchecked" name="timelapse">
       <customproperties>
         <Option type="Map">
-          <Option value="timelapse" type="QString" name="cached_name"/>
+          <Option type="QString" value="timelapse" name="cached_name"/>
         </Option>
       </customproperties>
     </layer-tree-layer>
-    <layer-tree-group checked="Qt::Checked" name="Feeding Stations" groupLayer="" expanded="1">
+    <layer-tree-group expanded="1" groupLayer="" checked="Qt::Checked" name="Feeding Stations">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer checked="Qt::Checked" legend_exp="" source="./water_tables.shp" name="water_tables" id="water_tables20170921142016467" providerKey="ogr" legend_split_behavior="0" patch_size="0,0" expanded="1">
+      <layer-tree-layer id="water_tables20170921142016467" expanded="1" legend_split_behavior="0" source="./water_tables.shp" legend_exp="" providerKey="ogr" patch_size="0,0" checked="Qt::Checked" name="water_tables">
         <customproperties>
           <Option type="Map">
-            <Option value="water_tables" type="QString" name="cached_name"/>
-            <Option name="expandedLegendNodes"/>
-          </Option>
-        </customproperties>
-      </layer-tree-layer>
-    </layer-tree-group>
-    <layer-tree-group checked="Qt::Unchecked" name="Ask Me" groupLayer="" expanded="0">
-      <customproperties>
-        <Option/>
-      </customproperties>
-      <layer-tree-layer checked="Qt::Unchecked" legend_exp="" source="./poi_labels.shp|layername=poi_labels" name="poi_labels" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" providerKey="ogr" legend_split_behavior="0" patch_size="0,0" expanded="1">
-        <customproperties>
-          <Option type="Map">
-            <Option value="poi_labels" type="QString" name="cached_name"/>
-          </Option>
-        </customproperties>
-      </layer-tree-layer>
-      <layer-tree-layer checked="Qt::Unchecked" legend_exp="" source="./directions_to_start.shp|layername=directions_to_start" name="directions_to_start" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" providerKey="ogr" legend_split_behavior="0" patch_size="0,0" expanded="1">
-        <customproperties>
-          <Option type="Map">
-            <Option value="directions_to_start" type="QString" name="cached_name"/>
-          </Option>
-        </customproperties>
-      </layer-tree-layer>
-    </layer-tree-group>
-    <layer-tree-group checked="Qt::Unchecked" name="Residents Access" groupLayer="" expanded="0">
-      <customproperties>
-        <Option/>
-      </customproperties>
-      <layer-tree-layer checked="Qt::Unchecked" legend_exp="" source="./mayor.shp" name="mayor" id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" providerKey="ogr" legend_split_behavior="0" patch_size="0,0" expanded="1">
-        <customproperties>
-          <Option type="Map">
-            <Option value="mayor" type="QString" name="cached_name"/>
-          </Option>
-        </customproperties>
-      </layer-tree-layer>
-      <layer-tree-layer checked="Qt::Unchecked" legend_exp="" source="./viplabels.shp" name="viplabels" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" providerKey="ogr" legend_split_behavior="0" patch_size="0,0" expanded="1">
-        <customproperties>
-          <Option type="Map">
-            <Option value="viplabels" type="QString" name="cached_name"/>
+            <Option type="QString" value="water_tables" name="cached_name"/>
             <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer checked="Qt::Unchecked" legend_exp="" source="./vipaccess.shp" name="vipaccess" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" providerKey="ogr" legend_split_behavior="0" patch_size="0,0" expanded="1">
+    </layer-tree-group>
+    <layer-tree-group expanded="0" groupLayer="" checked="Qt::Unchecked" name="Ask Me">
+      <customproperties>
+        <Option/>
+      </customproperties>
+      <layer-tree-layer id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" expanded="1" legend_split_behavior="0" source="./poi_labels.shp|layername=poi_labels" legend_exp="" providerKey="ogr" patch_size="0,0" checked="Qt::Unchecked" name="poi_labels">
         <customproperties>
           <Option type="Map">
-            <Option value="vipaccess" type="QString" name="cached_name"/>
+            <Option type="QString" value="poi_labels" name="cached_name"/>
+          </Option>
+        </customproperties>
+      </layer-tree-layer>
+      <layer-tree-layer id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" expanded="1" legend_split_behavior="0" source="./directions_to_start.shp|layername=directions_to_start" legend_exp="" providerKey="ogr" patch_size="0,0" checked="Qt::Unchecked" name="directions_to_start">
+        <customproperties>
+          <Option type="Map">
+            <Option type="QString" value="directions_to_start" name="cached_name"/>
+          </Option>
+        </customproperties>
+      </layer-tree-layer>
+    </layer-tree-group>
+    <layer-tree-group expanded="0" groupLayer="" checked="Qt::Unchecked" name="Residents Access">
+      <customproperties>
+        <Option/>
+      </customproperties>
+      <layer-tree-layer id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" expanded="1" legend_split_behavior="0" source="./mayor.shp" legend_exp="" providerKey="ogr" patch_size="0,0" checked="Qt::Unchecked" name="mayor">
+        <customproperties>
+          <Option type="Map">
+            <Option type="QString" value="mayor" name="cached_name"/>
+          </Option>
+        </customproperties>
+      </layer-tree-layer>
+      <layer-tree-layer id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" expanded="1" legend_split_behavior="0" source="./viplabels.shp" legend_exp="" providerKey="ogr" patch_size="0,0" checked="Qt::Unchecked" name="viplabels">
+        <customproperties>
+          <Option type="Map">
+            <Option type="QString" value="viplabels" name="cached_name"/>
             <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer checked="Qt::Unchecked" legend_exp="" source="./golfaccess.shp" name="golfaccess" id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" providerKey="ogr" legend_split_behavior="0" patch_size="0,0" expanded="0">
+      <layer-tree-layer id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" expanded="1" legend_split_behavior="0" source="./vipaccess.shp" legend_exp="" providerKey="ogr" patch_size="0,0" checked="Qt::Unchecked" name="vipaccess">
+        <customproperties>
+          <Option type="Map">
+            <Option type="QString" value="vipaccess" name="cached_name"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
+          </Option>
+        </customproperties>
+      </layer-tree-layer>
+      <layer-tree-layer id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" expanded="0" legend_split_behavior="0" source="./golfaccess.shp" legend_exp="" providerKey="ogr" patch_size="0,0" checked="Qt::Unchecked" name="golfaccess">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer checked="Qt::Unchecked" legend_exp="" source="./residents_access_roads.shp|layername=residents_access_roads" name="residents_access_roads" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" providerKey="ogr" legend_split_behavior="0" patch_size="0,0" expanded="1">
+      <layer-tree-layer id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" expanded="1" legend_split_behavior="0" source="./residents_access_roads.shp|layername=residents_access_roads" legend_exp="" providerKey="ogr" patch_size="0,0" checked="Qt::Unchecked" name="residents_access_roads">
         <customproperties>
           <Option type="Map">
-            <Option value="residents_access_roads" type="QString" name="cached_name"/>
+            <Option type="QString" value="residents_access_roads" name="cached_name"/>
             <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer checked="Qt::Unchecked" legend_exp="" source="./residents_access.shp|layername=residents_access" name="residents_access" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" providerKey="ogr" legend_split_behavior="0" patch_size="0,0" expanded="1">
+      <layer-tree-layer id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" expanded="1" legend_split_behavior="0" source="./residents_access.shp|layername=residents_access" legend_exp="" providerKey="ogr" patch_size="0,0" checked="Qt::Unchecked" name="residents_access">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group checked="Qt::Checked" name="OSM data" groupLayer="" expanded="1">
+    <layer-tree-group expanded="1" groupLayer="" checked="Qt::Checked" name="OSM data">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer checked="Qt::Checked" legend_exp="" source="./osm_roads.shp" name="osm_roads" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" providerKey="ogr" legend_split_behavior="0" patch_size="0,0" expanded="0">
+      <layer-tree-layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0" legend_split_behavior="0" source="./osm_roads.shp" legend_exp="" providerKey="ogr" patch_size="0,0" checked="Qt::Checked" name="osm_roads">
         <customproperties>
           <Option type="Map">
-            <Option value="osm_roads [3887]" type="QString" name="cached_name"/>
-            <Option name="expandedLegendNodes"/>
-            <Option value="1" type="QString" name="showFeatureCount"/>
+            <Option type="QString" value="osm_roads [3887]" name="cached_name"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
+            <Option type="QString" value="1" name="showFeatureCount"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer checked="Qt::Checked" legend_exp="" source="./osm_places.shp|layername=osm_places" name="osm_places" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" providerKey="ogr" legend_split_behavior="0" patch_size="0,0" expanded="1">
+      <layer-tree-layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" expanded="1" legend_split_behavior="0" source="./osm_places.shp|layername=osm_places" legend_exp="" providerKey="ogr" patch_size="0,0" checked="Qt::Checked" name="osm_places">
         <customproperties>
           <Option type="Map">
-            <Option value="osm_places [7]" type="QString" name="cached_name"/>
-            <Option name="expandedLegendNodes"/>
-            <Option value="1" type="QString" name="showFeatureCount"/>
+            <Option type="QString" value="osm_places [7]" name="cached_name"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
+            <Option type="QString" value="1" name="showFeatureCount"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group checked="Qt::Unchecked" name="Start and Finish pages" groupLayer="" expanded="1">
+    <layer-tree-group expanded="1" groupLayer="" checked="Qt::Unchecked" name="Start and Finish pages">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer checked="Qt::Unchecked" legend_exp="" source="./data-comments.shp" name="data-comments" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" providerKey="ogr" legend_split_behavior="0" patch_size="0,0" expanded="1">
+      <layer-tree-layer id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" expanded="1" legend_split_behavior="0" source="./data-comments.shp" legend_exp="" providerKey="ogr" patch_size="0,0" checked="Qt::Unchecked" name="data-comments">
         <customproperties>
           <Option type="Map">
             <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer checked="Qt::Unchecked" legend_exp="" source="./start_finish_area.shp" name="start_finish_area" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" providerKey="ogr" legend_split_behavior="0" patch_size="0,0" expanded="1">
+      <layer-tree-layer id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" expanded="1" legend_split_behavior="0" source="./start_finish_area.shp" legend_exp="" providerKey="ogr" patch_size="0,0" checked="Qt::Unchecked" name="start_finish_area">
         <customproperties>
           <Option type="Map">
             <Option type="invalid" name="expandedLegendNodes"/>
@@ -237,35 +237,35 @@
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group checked="Qt::Unchecked" name="Elevation" groupLayer="" expanded="0">
+    <layer-tree-group expanded="0" groupLayer="" checked="Qt::Unchecked" name="Elevation">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer checked="Qt::Unchecked" legend_exp="" source="./capetownelevation-1m.shp" name="capetownelevation-1m" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" providerKey="ogr" legend_split_behavior="0" patch_size="0,0" expanded="1">
+      <layer-tree-layer id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" expanded="1" legend_split_behavior="0" source="./capetownelevation-1m.shp" legend_exp="" providerKey="ogr" patch_size="0,0" checked="Qt::Unchecked" name="capetownelevation-1m">
         <customproperties>
           <Option type="Map">
-            <Option value="1" type="QString" name="showFeatureCount"/>
+            <Option type="QString" value="1" name="showFeatureCount"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group checked="Qt::Checked" name="Map" groupLayer="" expanded="1">
+    <layer-tree-group expanded="1" groupLayer="" checked="Qt::Checked" name="Map">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer checked="Qt::Unchecked" legend_exp="" source="./GDAL-City of Cape Town 2015 Aerial.xml" name="GDAL-City of Cape Town 2015 Aerial" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" providerKey="gdal" legend_split_behavior="0" patch_size="0,0" expanded="0">
+      <layer-tree-layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" expanded="0" legend_split_behavior="0" source="./GDAL-City of Cape Town 2015 Aerial.xml" legend_exp="" providerKey="gdal" patch_size="0,0" checked="Qt::Unchecked" name="GDAL-City of Cape Town 2015 Aerial">
         <customproperties>
           <Option type="Map">
-            <Option value="GDAL-City of Cape Town 2015 Aerial" type="QString" name="cached_name"/>
+            <Option type="QString" value="GDAL-City of Cape Town 2015 Aerial" name="cached_name"/>
             <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer checked="Qt::Checked" legend_exp="" 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" name="Outlines" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" providerKey="wms" legend_split_behavior="0" patch_size="0,0" expanded="1">
+      <layer-tree-layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" expanded="1" legend_split_behavior="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" legend_exp="" providerKey="wms" patch_size="0,0" checked="Qt::Checked" name="Outlines">
         <customproperties>
           <Option type="Map">
-            <Option value="Outlines" type="QString" name="cached_name"/>
-            <Option name="expandedLegendNodes"/>
+            <Option type="QString" value="Outlines" name="cached_name"/>
+            <Option type="invalid" name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
@@ -295,34 +295,34 @@
       <item>viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0</item>
       <item>fence_groups_cbaea960_3348_4aea_b155_46e5d310f792</item>
       <item>mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea</item>
-      <item>route_markers_d58f7174_b6d0_4e1c_80ed_0d74635b8ca6</item>
+      <item>route_markers_4e92bf25_f500_4b5f_bf49_9dd0b475a0c9</item>
     </custom-order>
   </layer-tree-group>
-  <snapping-settings unit="1" intersection-snapping="1" scaleDependencyMode="0" minScale="0" mode="3" maxScale="0" type="1" tolerance="10" self-snapping="1" enabled="0">
+  <snapping-settings self-snapping="1" minScale="0" unit="1" intersection-snapping="1" tolerance="10" scaleDependencyMode="0" type="1" maxScale="0" enabled="0" mode="3">
     <individual-layer-settings>
-      <layer-setting minScale="0" maxScale="0" type="1" id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" tolerance="12" enabled="0" units="1"/>
-      <layer-setting minScale="0" maxScale="0" type="2" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" tolerance="12" enabled="0" units="1"/>
-      <layer-setting minScale="0" maxScale="0" type="2" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" tolerance="12" enabled="0" units="1"/>
-      <layer-setting minScale="0" maxScale="0" type="2" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" tolerance="12" enabled="0" units="1"/>
-      <layer-setting minScale="0" maxScale="0" type="2" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" tolerance="12" enabled="0" units="1"/>
-      <layer-setting minScale="0" maxScale="0" type="2" id="water_tables20170921142016467" tolerance="0" enabled="0" units="2"/>
-      <layer-setting minScale="0" maxScale="0" type="2" id="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792" tolerance="12" enabled="0" units="1"/>
-      <layer-setting minScale="0" maxScale="0" type="2" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" tolerance="12" enabled="0" units="1"/>
-      <layer-setting minScale="0" maxScale="0" type="2" id="extra_security20170921130834191" tolerance="0" enabled="0" units="2"/>
-      <layer-setting minScale="0" maxScale="0" type="2" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" tolerance="12" enabled="0" units="1"/>
-      <layer-setting minScale="0" maxScale="0" type="2" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" tolerance="12" enabled="0" units="1"/>
-      <layer-setting minScale="0" maxScale="0" type="2" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" tolerance="12" enabled="0" units="1"/>
-      <layer-setting minScale="0" maxScale="0" type="1" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" tolerance="12" enabled="0" units="1"/>
-      <layer-setting minScale="0" maxScale="0" type="0" id="route_markers_d58f7174_b6d0_4e1c_80ed_0d74635b8ca6" tolerance="12" enabled="0" units="1"/>
-      <layer-setting minScale="0" maxScale="0" type="1" id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" tolerance="12" enabled="0" units="1"/>
-      <layer-setting minScale="0" maxScale="0" type="1" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" tolerance="12" enabled="0" units="1"/>
-      <layer-setting minScale="0" maxScale="0" type="2" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" tolerance="12" enabled="0" units="1"/>
-      <layer-setting minScale="0" maxScale="0" type="2" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" tolerance="12" enabled="0" units="1"/>
-      <layer-setting minScale="0" maxScale="0" type="2" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" tolerance="12" enabled="0" units="1"/>
-      <layer-setting minScale="0" maxScale="0" type="2" id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" tolerance="12" enabled="0" units="1"/>
-      <layer-setting minScale="0" maxScale="0" type="2" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" tolerance="12" enabled="0" units="1"/>
-      <layer-setting minScale="0" maxScale="0" type="2" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" tolerance="12" enabled="0" units="1"/>
-      <layer-setting minScale="0" maxScale="0" type="2" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" tolerance="20" enabled="1" units="1"/>
+      <layer-setting id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" minScale="0" tolerance="12" type="1" maxScale="0" units="1" enabled="0"/>
+      <layer-setting id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" minScale="0" tolerance="12" type="2" maxScale="0" units="1" enabled="0"/>
+      <layer-setting id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" minScale="0" tolerance="12" type="1" maxScale="0" units="1" enabled="0"/>
+      <layer-setting id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" minScale="0" tolerance="12" type="1" maxScale="0" units="1" enabled="0"/>
+      <layer-setting id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" minScale="0" tolerance="12" type="2" maxScale="0" units="1" enabled="0"/>
+      <layer-setting id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" minScale="0" tolerance="12" type="1" maxScale="0" units="1" enabled="0"/>
+      <layer-setting id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" minScale="0" tolerance="12" type="2" maxScale="0" units="1" enabled="0"/>
+      <layer-setting id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" minScale="0" tolerance="20" type="2" maxScale="0" units="1" enabled="1"/>
+      <layer-setting id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" minScale="0" tolerance="12" type="2" maxScale="0" units="1" enabled="0"/>
+      <layer-setting id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" minScale="0" tolerance="12" type="2" maxScale="0" units="1" enabled="0"/>
+      <layer-setting id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" minScale="0" tolerance="12" type="2" maxScale="0" units="1" enabled="0"/>
+      <layer-setting id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" minScale="0" tolerance="12" type="2" maxScale="0" units="1" enabled="0"/>
+      <layer-setting id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" minScale="0" tolerance="12" type="2" maxScale="0" units="1" enabled="0"/>
+      <layer-setting id="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792" minScale="0" tolerance="12" type="2" maxScale="0" units="1" enabled="0"/>
+      <layer-setting id="water_tables20170921142016467" minScale="0" tolerance="0" type="2" maxScale="0" units="2" enabled="0"/>
+      <layer-setting id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" minScale="0" tolerance="12" type="2" maxScale="0" units="1" enabled="0"/>
+      <layer-setting id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" minScale="0" tolerance="12" type="2" maxScale="0" units="1" enabled="0"/>
+      <layer-setting id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" minScale="0" tolerance="12" type="2" maxScale="0" units="1" enabled="0"/>
+      <layer-setting id="extra_security20170921130834191" minScale="0" tolerance="0" type="2" maxScale="0" units="2" enabled="0"/>
+      <layer-setting id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" minScale="0" tolerance="12" type="2" maxScale="0" units="1" enabled="0"/>
+      <layer-setting id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" minScale="0" tolerance="12" type="2" maxScale="0" units="1" enabled="0"/>
+      <layer-setting id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" minScale="0" tolerance="12" type="2" maxScale="0" units="1" enabled="0"/>
+      <layer-setting id="route_markers_4e92bf25_f500_4b5f_bf49_9dd0b475a0c9" minScale="0" tolerance="12" type="0" maxScale="0" units="1" enabled="0"/>
     </individual-layer-settings>
   </snapping-settings>
   <relations/>
@@ -330,10 +330,10 @@
   <mapcanvas annotationsVisible="1" name="theMapCanvas">
     <units>degrees</units>
     <extent>
-      <xmin>18.40304680199827914</xmin>
-      <ymin>-33.91746432349552265</ymin>
-      <xmax>18.41687072757535049</xmax>
-      <ymax>-33.90119829484044089</ymax>
+      <xmin>18.38106081301657824</xmin>
+      <ymin>-33.94563030202068887</ymin>
+      <xmax>18.41792461455543517</xmax>
+      <ymax>-33.90225422560713753</ymax>
     </extent>
     <rotation>0</rotation>
     <destinationsrs>
@@ -354,161 +354,161 @@
   </mapcanvas>
   <projectModels/>
   <legend updateDrawingOrder="true">
-    <legendgroup checked="Qt::Unchecked" name="Marshals" open="true">
-      <legendlayer checked="Qt::Unchecked" showFeatureCount="1" name="marshal_positions" drawingOrder="-1" open="true">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="0"/>
+    <legendgroup open="true" checked="Qt::Unchecked" name="Marshals">
+      <legendlayer open="true" showFeatureCount="1" checked="Qt::Unchecked" drawingOrder="-1" name="marshal_positions">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile layerid="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" showFeatureCount="0" name="extra_security" drawingOrder="-1" open="true">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="extra_security20170921130834191" visible="0"/>
+      <legendlayer open="true" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" name="extra_security">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile layerid="extra_security20170921130834191" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" showFeatureCount="0" name="marshals_by_position" drawingOrder="-1" open="true">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="marshals_by_position20161003112326575" visible="0"/>
+      <legendlayer open="true" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" name="marshals_by_position">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile layerid="marshals_by_position20161003112326575" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" showFeatureCount="0" name="complete_marshal_overview" drawingOrder="-1" open="true">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" visible="0"/>
+      <legendlayer open="true" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" name="complete_marshal_overview">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile layerid="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" showFeatureCount="0" name="marshal_overviews" drawingOrder="-1" open="false">
-        <filegroup hidden="false" open="false">
-          <legendlayerfile isInOverview="0" layerid="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" visible="0"/>
+      <legendlayer open="false" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" name="marshal_overviews">
+        <filegroup open="false" hidden="false">
+          <legendlayerfile layerid="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Unchecked" name="Fencing and Cones" open="true">
-      <legendlayer checked="Qt::Unchecked" showFeatureCount="0" name="fencing" drawingOrder="-1" open="true">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0"/>
+    <legendgroup open="true" checked="Qt::Unchecked" name="Fencing and Cones">
+      <legendlayer open="true" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" name="fencing">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile layerid="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" showFeatureCount="0" name="fence_groups" drawingOrder="-1" open="true">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792" visible="0"/>
+      <legendlayer open="true" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" name="fence_groups">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile layerid="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Checked" name="Routes" open="true">
-      <legendgroup checked="Qt::Checked" name="Markers" open="true">
-        <legendlayer checked="Qt::Unchecked" showFeatureCount="1" name="route_markers" drawingOrder="-1" open="true">
-          <filegroup hidden="false" open="true">
-            <legendlayerfile isInOverview="0" layerid="route_markers_d58f7174_b6d0_4e1c_80ed_0d74635b8ca6" visible="0"/>
+    <legendgroup open="true" checked="Qt::Checked" name="Routes">
+      <legendgroup open="true" checked="Qt::Checked" name="Markers">
+        <legendlayer open="true" showFeatureCount="1" checked="Qt::Checked" drawingOrder="-1" name="route_markers">
+          <filegroup open="true" hidden="false">
+            <legendlayerfile layerid="route_markers_4e92bf25_f500_4b5f_bf49_9dd0b475a0c9" isInOverview="0" visible="1"/>
           </filegroup>
         </legendlayer>
       </legendgroup>
-      <legendlayer checked="Qt::Checked" showFeatureCount="0" name="all_routes" drawingOrder="-1" open="true">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1"/>
+      <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" drawingOrder="-1" name="all_routes">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile layerid="all_routes_5833accf_77da_42ef_a24a_197208cd2190" isInOverview="0" visible="1"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendlayer checked="Qt::Unchecked" showFeatureCount="0" name="timelapse" drawingOrder="-1" open="false">
-      <filegroup hidden="false" open="false">
-        <legendlayerfile isInOverview="0" layerid="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" visible="0"/>
+    <legendlayer open="false" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" name="timelapse">
+      <filegroup open="false" hidden="false">
+        <legendlayerfile layerid="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" isInOverview="0" visible="0"/>
       </filegroup>
     </legendlayer>
-    <legendgroup checked="Qt::Checked" name="Feeding Stations" open="true">
-      <legendlayer checked="Qt::Checked" showFeatureCount="0" name="water_tables" drawingOrder="-1" open="true">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="water_tables20170921142016467" visible="1"/>
+    <legendgroup open="true" checked="Qt::Checked" name="Feeding Stations">
+      <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" drawingOrder="-1" name="water_tables">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile layerid="water_tables20170921142016467" isInOverview="0" visible="1"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Unchecked" name="Ask Me" open="false">
-      <legendlayer checked="Qt::Unchecked" showFeatureCount="0" name="poi_labels" drawingOrder="-1" open="true">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" visible="0"/>
+    <legendgroup open="false" checked="Qt::Unchecked" name="Ask Me">
+      <legendlayer open="true" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" name="poi_labels">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile layerid="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" showFeatureCount="0" name="directions_to_start" drawingOrder="-1" open="true">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" visible="0"/>
+      <legendlayer open="true" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" name="directions_to_start">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile layerid="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Unchecked" name="Residents Access" open="false">
-      <legendlayer checked="Qt::Unchecked" showFeatureCount="0" name="mayor" drawingOrder="-1" open="true">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" visible="0"/>
+    <legendgroup open="false" checked="Qt::Unchecked" name="Residents Access">
+      <legendlayer open="true" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" name="mayor">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile layerid="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" showFeatureCount="0" name="viplabels" drawingOrder="-1" open="true">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" visible="0"/>
+      <legendlayer open="true" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" name="viplabels">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile layerid="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" showFeatureCount="0" name="vipaccess" drawingOrder="-1" open="true">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" visible="0"/>
+      <legendlayer open="true" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" name="vipaccess">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile layerid="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" showFeatureCount="0" name="golfaccess" drawingOrder="-1" open="false">
-        <filegroup hidden="false" open="false">
-          <legendlayerfile isInOverview="0" layerid="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" visible="0"/>
+      <legendlayer open="false" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" name="golfaccess">
+        <filegroup open="false" hidden="false">
+          <legendlayerfile layerid="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" showFeatureCount="0" name="residents_access_roads" drawingOrder="-1" open="true">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" visible="0"/>
+      <legendlayer open="true" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" name="residents_access_roads">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile layerid="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" showFeatureCount="0" name="residents_access" drawingOrder="-1" open="true">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" visible="0"/>
+      <legendlayer open="true" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" name="residents_access">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile layerid="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Checked" name="OSM data" open="true">
-      <legendlayer checked="Qt::Checked" showFeatureCount="1" name="osm_roads" drawingOrder="-1" open="false">
-        <filegroup hidden="false" open="false">
-          <legendlayerfile isInOverview="0" layerid="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1"/>
+    <legendgroup open="true" checked="Qt::Checked" name="OSM data">
+      <legendlayer open="false" showFeatureCount="1" checked="Qt::Checked" drawingOrder="-1" name="osm_roads">
+        <filegroup open="false" hidden="false">
+          <legendlayerfile layerid="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" isInOverview="0" visible="1"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Checked" showFeatureCount="1" name="osm_places" drawingOrder="-1" open="true">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1"/>
+      <legendlayer open="true" showFeatureCount="1" checked="Qt::Checked" drawingOrder="-1" name="osm_places">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile layerid="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" isInOverview="0" visible="1"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Unchecked" name="Start and Finish pages" open="true">
-      <legendlayer checked="Qt::Unchecked" showFeatureCount="0" name="data-comments" drawingOrder="-1" open="true">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" visible="0"/>
+    <legendgroup open="true" checked="Qt::Unchecked" name="Start and Finish pages">
+      <legendlayer open="true" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" name="data-comments">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile layerid="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Unchecked" showFeatureCount="0" name="start_finish_area" drawingOrder="-1" open="true">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" visible="0"/>
+      <legendlayer open="true" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" name="start_finish_area">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile layerid="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Unchecked" name="Elevation" open="false">
-      <legendlayer checked="Qt::Unchecked" showFeatureCount="1" name="capetownelevation-1m" drawingOrder="-1" open="true">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" visible="0"/>
+    <legendgroup open="false" checked="Qt::Unchecked" name="Elevation">
+      <legendlayer open="true" showFeatureCount="1" checked="Qt::Unchecked" drawingOrder="-1" name="capetownelevation-1m">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile layerid="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup checked="Qt::Checked" name="Map" open="true">
-      <legendlayer checked="Qt::Unchecked" showFeatureCount="0" name="GDAL-City of Cape Town 2015 Aerial" drawingOrder="-1" open="false">
-        <filegroup hidden="false" open="false">
-          <legendlayerfile isInOverview="0" layerid="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="0"/>
+    <legendgroup open="true" checked="Qt::Checked" name="Map">
+      <legendlayer open="false" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" name="GDAL-City of Cape Town 2015 Aerial">
+        <filegroup open="false" hidden="false">
+          <legendlayerfile layerid="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer checked="Qt::Checked" showFeatureCount="0" name="Outlines" drawingOrder="-1" open="true">
-        <filegroup hidden="false" open="true">
-          <legendlayerfile isInOverview="0" layerid="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1"/>
+      <legendlayer open="true" showFeatureCount="0" checked="Qt::Checked" drawingOrder="-1" name="Outlines">
+        <filegroup open="true" hidden="false">
+          <legendlayerfile layerid="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" isInOverview="0" visible="1"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
   </legend>
   <mapViewDocks/>
-  <main-annotation-layer refreshOnNotifyEnabled="0" autoRefreshTime="0" type="annotation" autoRefreshEnabled="0" legendPlaceholderImage="" refreshOnNotifyMessage="">
+  <main-annotation-layer refreshOnNotifyEnabled="0" refreshOnNotifyMessage="" type="annotation" legendPlaceholderImage="" autoRefreshTime="0" autoRefreshEnabled="0">
     <id>Annotations_246fb3fe_ae9e_4941_a02a_224c6f83119c</id>
     <datasource></datasource>
     <keywordList>
@@ -559,7 +559,7 @@
     <paintEffect/>
   </main-annotation-layer>
   <projectlayers>
-    <maplayer minScale="1e+08" refreshOnNotifyEnabled="0" autoRefreshTime="0" maxScale="100000" type="raster" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" autoRefreshEnabled="0" legendPlaceholderImage="" refreshOnNotifyMessage="">
+    <maplayer refreshOnNotifyEnabled="0" refreshOnNotifyMessage="" minScale="1e+08" hasScaleBasedVisibilityFlag="0" type="raster" maxScale="100000" legendPlaceholderImage="" styleCategories="AllStyleCategories" autoRefreshTime="0" autoRefreshEnabled="0">
       <extent>
         <xmin>-20037508.33999999985098839</xmin>
         <ymin>-20037508.33999999985098839</ymin>
@@ -624,7 +624,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxy="0" minz="0" dimensions="2" maxx="0" maxz="0" miny="0" minx="0" crs=""/>
+          <spatial maxz="0" minx="0" maxx="0" minz="0" crs="" miny="0" maxy="0" dimensions="2"/>
           <temporal>
             <period>
               <start></start>
@@ -649,58 +649,58 @@
         <Searchable>0</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fetchMode="0" mode="0" enabled="0">
+      <temporal fetchMode="0" enabled="0" mode="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zscale="1" band="1" symbology="Line" zoffset="0" enabled="0">
+      <elevation symbology="Line" zscale="1" band="1" zoffset="0" enabled="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="152,125,183,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="152,125,183,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -731,36 +731,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="152,125,183,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="152,125,183,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                <Option type="QString" value="no" name="outline_style"/>
+                <Option type="QString" value="0.26" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="152,125,183,255"/>
@@ -775,9 +775,9 @@
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -786,27 +786,27 @@
       </elevation>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="no_action" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option value="false" type="QString" name="WMSBackgroundLayer"/>
-          <Option value="false" type="QString" name="WMSPublishDataSourceUrl"/>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
-          <Option value="Value" type="QString" name="identify/format"/>
+          <Option type="QString" value="copy" name="QFieldSync/action"/>
+          <Option type="QString" value="no_action" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="false" name="WMSBackgroundLayer"/>
+          <Option type="QString" value="false" name="WMSPublishDataSourceUrl"/>
+          <Option type="QString" value="0" name="embeddedWidgets/count"/>
+          <Option type="QString" value="Value" name="identify/format"/>
         </Option>
       </customproperties>
       <pipe-data-defined-properties>
         <Option type="Map">
-          <Option value="" type="QString" name="name"/>
+          <Option type="QString" value="" name="name"/>
           <Option name="properties"/>
-          <Option value="collection" type="QString" name="type"/>
+          <Option type="QString" value="collection" name="type"/>
         </Option>
       </pipe-data-defined-properties>
       <pipe>
         <provider>
-          <resampling maxOversampling="2" zoomedInResamplingMethod="nearestNeighbour" zoomedOutResamplingMethod="nearestNeighbour" enabled="false"/>
+          <resampling zoomedOutResamplingMethod="nearestNeighbour" enabled="false" maxOversampling="2" zoomedInResamplingMethod="nearestNeighbour"/>
         </provider>
-        <rasterrenderer opacity="0.5" alphaBand="-1" nodataColor="" type="multibandcolor" redBand="1" greenBand="2" blueBand="3">
+        <rasterrenderer redBand="1" type="multibandcolor" opacity="0.5" alphaBand="-1" nodataColor="" greenBand="2" blueBand="3">
           <rasterTransparency/>
           <minMaxOrigin>
             <limits>None</limits>
@@ -817,14 +817,14 @@
             <stdDevFactor>2</stdDevFactor>
           </minMaxOrigin>
         </rasterrenderer>
-        <brightnesscontrast gamma="1" contrast="0" brightness="0"/>
-        <huesaturation colorizeOn="0" grayscaleMode="0" colorizeStrength="100" colorizeBlue="128" saturation="0" colorizeRed="255" colorizeGreen="128" invertColors="0"/>
+        <brightnesscontrast gamma="1" brightness="0" contrast="0"/>
+        <huesaturation saturation="0" grayscaleMode="0" colorizeBlue="128" colorizeOn="0" invertColors="0" colorizeGreen="128" colorizeStrength="100" colorizeRed="255"/>
         <rasterresampler maxOversampling="2"/>
         <resamplingStage>resamplingFilter</resamplingStage>
       </pipe>
       <blendMode>0</blendMode>
     </maplayer>
-    <maplayer minScale="1e+08" refreshOnNotifyEnabled="0" autoRefreshTime="0" maxScale="0" type="raster" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" autoRefreshEnabled="0" legendPlaceholderImage="" refreshOnNotifyMessage="">
+    <maplayer refreshOnNotifyEnabled="0" refreshOnNotifyMessage="" minScale="1e+08" hasScaleBasedVisibilityFlag="0" type="raster" maxScale="0" legendPlaceholderImage="" styleCategories="AllStyleCategories" autoRefreshTime="0" autoRefreshEnabled="0">
       <extent>
         <xmin>-20037508.34278924390673637</xmin>
         <ymin>-20037508.62692909315228462</ymin>
@@ -889,7 +889,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxy="0" minz="0" dimensions="2" maxx="0" maxz="0" miny="0" minx="0" crs=""/>
+          <spatial maxz="0" minx="0" maxx="0" minz="0" crs="" miny="0" maxy="0" dimensions="2"/>
           <temporal>
             <period>
               <start></start>
@@ -912,58 +912,58 @@
         <Searchable>0</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal fetchMode="0" mode="0" enabled="0">
+      <temporal fetchMode="0" enabled="0" mode="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zscale="1" band="1" symbology="Line" zoffset="0" enabled="0">
+      <elevation symbology="Line" zscale="1" band="1" zoffset="0" enabled="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="225,89,137,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="225,89,137,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -994,36 +994,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="225,89,137,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="225,89,137,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                <Option type="QString" value="no" name="outline_style"/>
+                <Option type="QString" value="0.26" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="225,89,137,255"/>
@@ -1038,9 +1038,9 @@
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -1049,27 +1049,27 @@
       </elevation>
       <customproperties>
         <Option type="Map">
-          <Option value="no_action" type="QString" name="QFieldSync/action"/>
-          <Option value="no_action" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option value="true" type="QString" name="WMSBackgroundLayer"/>
-          <Option value="false" type="QString" name="WMSPublishDataSourceUrl"/>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
-          <Option value="Undefined" type="QString" name="identify/format"/>
+          <Option type="QString" value="no_action" name="QFieldSync/action"/>
+          <Option type="QString" value="no_action" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="true" name="WMSBackgroundLayer"/>
+          <Option type="QString" value="false" name="WMSPublishDataSourceUrl"/>
+          <Option type="QString" value="0" name="embeddedWidgets/count"/>
+          <Option type="QString" value="Undefined" name="identify/format"/>
         </Option>
       </customproperties>
       <pipe-data-defined-properties>
         <Option type="Map">
-          <Option value="" type="QString" name="name"/>
+          <Option type="QString" value="" name="name"/>
           <Option name="properties"/>
-          <Option value="collection" type="QString" name="type"/>
+          <Option type="QString" value="collection" name="type"/>
         </Option>
       </pipe-data-defined-properties>
       <pipe>
         <provider>
-          <resampling maxOversampling="2" zoomedInResamplingMethod="nearestNeighbour" zoomedOutResamplingMethod="nearestNeighbour" enabled="false"/>
+          <resampling zoomedOutResamplingMethod="nearestNeighbour" enabled="false" maxOversampling="2" zoomedInResamplingMethod="nearestNeighbour"/>
         </provider>
-        <rasterrenderer opacity="0.75" alphaBand="-1" band="1" nodataColor="" type="singlebandcolordata">
+        <rasterrenderer type="singlebandcolordata" opacity="0.75" alphaBand="-1" band="1" nodataColor="">
           <rasterTransparency/>
           <minMaxOrigin>
             <limits>None</limits>
@@ -1080,25 +1080,25 @@
             <stdDevFactor>2</stdDevFactor>
           </minMaxOrigin>
         </rasterrenderer>
-        <brightnesscontrast gamma="1" contrast="0" brightness="0"/>
-        <huesaturation colorizeOn="0" grayscaleMode="0" colorizeStrength="100" colorizeBlue="128" saturation="0" colorizeRed="255" colorizeGreen="128" invertColors="0"/>
+        <brightnesscontrast gamma="1" brightness="0" contrast="0"/>
+        <huesaturation saturation="0" grayscaleMode="0" colorizeBlue="128" colorizeOn="0" invertColors="0" colorizeGreen="128" colorizeStrength="100" colorizeRed="255"/>
         <rasterresampler maxOversampling="2"/>
         <resamplingStage>resamplingFilter</resamplingStage>
       </pipe>
       <blendMode>0</blendMode>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" simplifyLocal="1" autoRefreshTime="0" wkbType="MultiLineString" simplifyDrawingHints="0" type="vector" symbologyReferenceScale="-1" minScale="100000000" legendPlaceholderImage="" refreshOnNotifyEnabled="0" labelsEnabled="1" maxScale="100000" styleCategories="AllStyleCategories" simplifyAlgorithm="0" refreshOnNotifyMessage="" readOnly="0" geometry="Line" autoRefreshEnabled="0" simplifyDrawingTol="1">
+    <maplayer simplifyLocal="1" simplifyDrawingHints="0" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1" legendPlaceholderImage="" symbologyReferenceScale="-1" readOnly="0" refreshOnNotifyEnabled="0" minScale="100000000" maxScale="100000" type="vector" autoRefreshTime="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="1" styleCategories="AllStyleCategories" geometry="Line" autoRefreshEnabled="0" wkbType="MultiLineString">
       <extent>
         <xmin>18.37527226735897301</xmin>
         <ymin>-33.95648400000000322</ymin>
         <xmax>18.42291227690369482</xmax>
-        <ymax>-33.89943829535213382</ymax>
+        <ymax>-33.89943073673109808</ymax>
       </extent>
       <wgs84extent>
         <xmin>18.37527226735897301</xmin>
         <ymin>-33.95648400000000322</ymin>
         <xmax>18.42291227690369482</xmax>
-        <ymax>-33.89943829535213382</ymax>
+        <ymax>-33.89943073673109808</ymax>
       </wgs84extent>
       <id>all_routes_5833accf_77da_42ef_a24a_197208cd2190</id>
       <datasource>./all_routes.shp|layername=all_routes</datasource>
@@ -1152,7 +1152,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxy="0" minz="0" dimensions="2" maxx="0" maxz="0" miny="0" minx="0" crs=""/>
+          <spatial maxz="0" minx="0" maxx="0" minz="0" crs="" miny="0" maxy="0" dimensions="2"/>
           <temporal>
             <period>
               <start></start>
@@ -1166,8 +1166,8 @@
       <layerDependencies/>
       <dataDependencies/>
       <expressionfields>
-        <field typeName="double precision" subType="0" type="6" name="length_km" precision="0" expression="$length * 100" length="-1" comment=""/>
-        <field typeName="double precision" subType="0" type="6" name="length_m" precision="0" expression="$length * 100 * 1000" length="-1" comment=""/>
+        <field precision="0" comment="" type="6" expression="$length * 100" length="-1" subType="0" typeName="double precision" name="length_km"/>
+        <field precision="0" comment="" type="6" expression="$length * 100 * 1000" length="-1" subType="0" typeName="double precision" name="length_m"/>
       </expressionfields>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
@@ -1180,58 +1180,58 @@
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="RouteLen" startExpression="" mode="0" limitMode="0" endField="" fixedDuration="0" accumulate="0" durationUnit="min" startField="" endExpression="" enabled="0">
+      <temporal durationField="RouteLen" fixedDuration="0" accumulate="0" endField="" startField="" enabled="0" startExpression="" endExpression="" durationUnit="min" mode="0" limitMode="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" zscale="1" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" binding="Centroid" type="IndividualFeatures" symbology="Line" extrusion="0" zoffset="0">
+      <elevation extrusionEnabled="0" symbology="Line" type="IndividualFeatures" zscale="1" clamping="Terrain" showMarkerSymbolInSurfacePlots="0" zoffset="0" extrusion="0" respectLayerSymbol="1" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="229,182,54,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="229,182,54,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -1262,36 +1262,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="229,182,54,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="164,130,39,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="229,182,54,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="164,130,39,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="229,182,54,255"/>
@@ -1306,44 +1306,44 @@
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="229,182,54,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="164,130,39,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="229,182,54,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="diamond" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="164,130,39,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="3" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -1366,59 +1366,59 @@
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" type="RuleRenderer" symbollevels="0" referencescale="-1" enableorderby="0">
+      <renderer-v2 enableorderby="0" type="RuleRenderer" symbollevels="0" referencescale="-1" forceraster="0">
         <rules key="{cdec7d40-64aa-438c-9c37-b3d2a98670e7}">
-          <rule filter="$id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone)' )" description="Only show when active in Atlas" symbol="0" label="Active Routes" checkstate="0" key="{7132fb4b-2762-4af3-8eb0-4be2b1c0cf6c}">
-            <rule filter="&quot;Source&quot; = '21KM'" description="This should be disabled, since it's only for legends" symbol="1" label="21KM" checkstate="0" key="{a2b868a3-1709-41cf-b920-118bdfa2d5d3}"/>
-            <rule filter="&quot;Source&quot; = '10KM'" description="This should be disabled, since it's only for legends" symbol="2" label="10KM" checkstate="0" key="{17faeda5-eb56-4a1b-b784-639b6c7334d2}"/>
-            <rule filter="&quot;Source&quot; = '5KM'" description="This should be disabled, since it's only for legends" symbol="3" label="5KM" checkstate="0" key="{bdafe9b2-4918-427d-89be-41870f96981f}"/>
-            <rule filter="&quot;Source&quot; = 'Trail'" description="This should be disabled, since it's only for legends" symbol="4" label="Trail" checkstate="0" key="{151f553a-04cc-4e24-b74d-37d5618f5223}"/>
+          <rule description="Only show when active in Atlas" symbol="0" label="Active Routes" key="{7132fb4b-2762-4af3-8eb0-4be2b1c0cf6c}" filter="$id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone)' )" checkstate="0">
+            <rule description="This should be disabled, since it's only for legends" symbol="1" label="21KM" key="{a2b868a3-1709-41cf-b920-118bdfa2d5d3}" filter="&quot;Source&quot; = '21KM'" checkstate="0"/>
+            <rule description="This should be disabled, since it's only for legends" symbol="2" label="10KM" key="{17faeda5-eb56-4a1b-b784-639b6c7334d2}" filter="&quot;Source&quot; = '10KM'" checkstate="0"/>
+            <rule description="This should be disabled, since it's only for legends" symbol="3" label="5KM" key="{bdafe9b2-4918-427d-89be-41870f96981f}" filter="&quot;Source&quot; = '5KM'" checkstate="0"/>
+            <rule description="This should be disabled, since it's only for legends" symbol="4" label="Trail" key="{151f553a-04cc-4e24-b74d-37d5618f5223}" filter="&quot;Source&quot; = 'Trail'" checkstate="0"/>
           </rule>
-          <rule filter="regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; ) AND ( $id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone)' ) )" description="Only show when active in Atlas" symbol="5" label="Show by day" key="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}">
-            <rule filter="&quot;Source&quot; = '21KM'" description="This should be disabled, since it's only for legends" symbol="6" label="21KM" checkstate="0" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}"/>
-            <rule filter="&quot;Source&quot; = '10KM'" description="This should be disabled, since it's only for legends" symbol="7" label="10KM" checkstate="0" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}"/>
-            <rule filter="&quot;Source&quot; = '5KM'" description="This should be disabled, since it's only for legends" symbol="8" label="5KM" checkstate="0" key="{871a9276-8278-4528-911c-7e434c0885d3}"/>
-            <rule filter="&quot;Source&quot; = 'Trail'" description="This should be disabled, since it's only for legends" symbol="9" label="Trail" checkstate="0" key="{82ba5c12-5eaf-4bf1-af1a-89035ce48b3a}"/>
+          <rule description="Only show when active in Atlas" symbol="5" label="Show by day" key="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}" filter="regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; ) AND ( $id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone)' ) )">
+            <rule description="This should be disabled, since it's only for legends" symbol="6" label="21KM" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" filter="&quot;Source&quot; = '21KM'" checkstate="0"/>
+            <rule description="This should be disabled, since it's only for legends" symbol="7" label="10KM" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" filter="&quot;Source&quot; = '10KM'" checkstate="0"/>
+            <rule description="This should be disabled, since it's only for legends" symbol="8" label="5KM" key="{871a9276-8278-4528-911c-7e434c0885d3}" filter="&quot;Source&quot; = '5KM'" checkstate="0"/>
+            <rule description="This should be disabled, since it's only for legends" symbol="9" label="Trail" key="{82ba5c12-5eaf-4bf1-af1a-89035ce48b3a}" filter="&quot;Source&quot; = 'Trail'" checkstate="0"/>
           </rule>
-          <rule symbol="10" label="Always show" checkstate="0" key="{95b90b1e-90e8-4f30-830e-b2025d38b822}"/>
-          <rule filter="regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" symbol="11" label="Always show by day" checkstate="0" key="{ca3590cd-5839-41e2-824b-eca47a2b7a14}"/>
+          <rule symbol="10" label="Always show" key="{95b90b1e-90e8-4f30-830e-b2025d38b822}" checkstate="0"/>
+          <rule symbol="11" label="Always show by day" key="{ca3590cd-5839-41e2-824b-eca47a2b7a14}" filter="regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" checkstate="0"/>
         </rules>
         <symbols>
-          <symbol is_animated="0" type="line" name="0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="500" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="RenderMetersInMapUnits" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="250" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="RenderMetersInMapUnits" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="Interval" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="500" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="RenderMetersInMapUnits" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="250" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="RenderMetersInMapUnits" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="Interval" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -1438,44 +1438,44 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="interval">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="offsetAlongLine">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" type="marker" name="@0@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+              <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@0@0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer locked="0" class="FilledMarker" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="0,0,0,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MapUnit" type="QString" name="offset_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="0,0,0,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="filled_arrowhead" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MapUnit" name="offset_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="0,0,0,255"/>
@@ -1491,32 +1491,32 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol is_animated="0" type="fill" name="@@0@0@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+                  <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@@0@0@0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="0,0,0,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="227,26,28,0" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="0,0,0,255" name="color"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="227,26,28,0" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="0,0,0,255"/>
@@ -1531,15 +1531,15 @@
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option value="true" type="bool" name="active"/>
-                              <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                              <Option value="3" type="int" name="type"/>
+                              <Option type="bool" value="true" name="active"/>
+                              <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
+                              <Option type="int" value="3" name="type"/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -1547,35 +1547,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.5" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0,0,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.5" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -1606,36 +1606,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="LastVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="3" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="LastVertex" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -1655,40 +1655,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" type="marker" name="@0@2" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+              <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@0@2">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="0,0,0,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="square" name="cap_style"/>
+                    <Option type="QString" value="0,0,0,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="circle" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="0,0,0,0" name="outline_color"/>
+                    <Option type="QString" value="solid" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -1711,38 +1711,38 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option value="true" type="bool" name="active"/>
-                          <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                          <Option value="3" type="int" name="type"/>
+                          <Option type="bool" value="true" name="active"/>
+                          <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
+                          <Option type="int" value="3" name="type"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="FirstVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="3" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="FirstVertex" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -1762,40 +1762,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" type="marker" name="@0@3" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+              <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@0@3">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="0,0,0,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="square" name="cap_style"/>
+                    <Option type="QString" value="0,0,0,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="circle" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="0,0,0,0" name="outline_color"/>
+                    <Option type="QString" value="solid" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -1818,47 +1818,47 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option value="true" type="bool" name="active"/>
-                          <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                          <Option value="3" type="int" name="type"/>
+                          <Option type="bool" value="true" name="active"/>
+                          <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
+                          <Option type="int" value="3" name="type"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol is_animated="0" type="line" name="1" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="500" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="RenderMetersInMapUnits" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="250" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="RenderMetersInMapUnits" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="Interval" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="500" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="RenderMetersInMapUnits" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="250" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="RenderMetersInMapUnits" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="Interval" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -1878,44 +1878,44 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="interval">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="offsetAlongLine">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" type="marker" name="@1@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+              <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@1@0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer locked="0" class="FilledMarker" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="210,32,39,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MapUnit" type="QString" name="offset_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="210,32,39,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="filled_arrowhead" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MapUnit" name="offset_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="210,32,39,255"/>
@@ -1931,32 +1931,32 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol is_animated="0" type="fill" name="@@1@0@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+                  <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@@1@0@0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="210,32,39,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="227,26,28,0" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="210,32,39,255" name="color"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="227,26,28,0" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="210,32,39,255"/>
@@ -1971,15 +1971,15 @@
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option value="false" type="bool" name="active"/>
-                              <Option value="1" type="int" name="type"/>
-                              <Option value="" type="QString" name="val"/>
+                              <Option type="bool" value="false" name="active"/>
+                              <Option type="int" value="1" name="type"/>
+                              <Option type="QString" value="" name="val"/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -1987,35 +1987,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="210,32,39,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.5" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="210,32,39,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.5" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -2046,36 +2046,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="LastVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="3" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="LastVertex" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -2095,40 +2095,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" type="marker" name="@1@2" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+              <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@1@2">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="210,32,39,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="square" name="cap_style"/>
+                    <Option type="QString" value="210,32,39,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="circle" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="0,0,0,0" name="outline_color"/>
+                    <Option type="QString" value="solid" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -2151,38 +2151,38 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="int" value="1" name="type"/>
+                          <Option type="QString" value="" name="val"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="FirstVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="3" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="FirstVertex" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -2202,40 +2202,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" type="marker" name="@1@3" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+              <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@1@3">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="210,32,39,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="square" name="cap_style"/>
+                    <Option type="QString" value="210,32,39,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="circle" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="0,0,0,0" name="outline_color"/>
+                    <Option type="QString" value="solid" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -2258,58 +2258,58 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="int" value="1" name="type"/>
+                          <Option type="QString" value="" name="val"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol is_animated="0" type="line" name="10" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="10">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.26" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0,0,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.26" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -2340,56 +2340,56 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'  THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'  THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" type="line" name="11" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="11">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.46" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0,0,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.46" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -2420,45 +2420,45 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'  THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'  THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" type="line" name="2" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="2">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="500" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="RenderMetersInMapUnits" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="250" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="RenderMetersInMapUnits" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="Interval" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="500" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="RenderMetersInMapUnits" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="250" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="RenderMetersInMapUnits" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="Interval" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -2478,44 +2478,44 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="interval">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="offsetAlongLine">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" type="marker" name="@2@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+              <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@2@0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer locked="0" class="FilledMarker" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="103,34,144,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MapUnit" type="QString" name="offset_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="103,34,144,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="filled_arrowhead" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MapUnit" name="offset_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="103,34,144,255"/>
@@ -2531,32 +2531,32 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol is_animated="0" type="fill" name="@@2@0@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+                  <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@@2@0@0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="103,34,144,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="227,26,28,0" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="103,34,144,255" name="color"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="227,26,28,0" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="103,34,144,255"/>
@@ -2571,15 +2571,15 @@
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option value="false" type="bool" name="active"/>
-                              <Option value="1" type="int" name="type"/>
-                              <Option value="" type="QString" name="val"/>
+                              <Option type="bool" value="false" name="active"/>
+                              <Option type="int" value="1" name="type"/>
+                              <Option type="QString" value="" name="val"/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -2587,35 +2587,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="103,34,144,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.5" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="103,34,144,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.5" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -2646,36 +2646,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="LastVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="3" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="LastVertex" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -2695,40 +2695,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" type="marker" name="@2@2" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+              <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@2@2">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="103,34,144,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="square" name="cap_style"/>
+                    <Option type="QString" value="103,34,144,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="circle" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="0,0,0,0" name="outline_color"/>
+                    <Option type="QString" value="solid" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -2751,38 +2751,38 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="int" value="1" name="type"/>
+                          <Option type="QString" value="" name="val"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="FirstVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="3" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="FirstVertex" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -2802,40 +2802,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" type="marker" name="@2@3" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+              <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@2@3">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="103,34,144,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="square" name="cap_style"/>
+                    <Option type="QString" value="103,34,144,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="circle" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="0,0,0,0" name="outline_color"/>
+                    <Option type="QString" value="solid" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -2858,47 +2858,47 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="int" value="1" name="type"/>
+                          <Option type="QString" value="" name="val"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol is_animated="0" type="line" name="3" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="3">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="500" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="RenderMetersInMapUnits" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="250" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="RenderMetersInMapUnits" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="Interval" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="500" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="RenderMetersInMapUnits" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="250" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="RenderMetersInMapUnits" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="Interval" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -2918,44 +2918,44 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="interval">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="offsetAlongLine">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" type="marker" name="@3@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+              <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@3@0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer locked="0" class="FilledMarker" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="145,211,55,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MapUnit" type="QString" name="offset_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="145,211,55,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="filled_arrowhead" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MapUnit" name="offset_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="145,211,55,255"/>
@@ -2971,32 +2971,32 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol is_animated="0" type="fill" name="@@3@0@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+                  <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@@3@0@0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="145,211,55,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="227,26,28,0" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="145,211,55,255" name="color"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="227,26,28,0" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="145,211,55,255"/>
@@ -3011,15 +3011,15 @@
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option value="false" type="bool" name="active"/>
-                              <Option value="1" type="int" name="type"/>
-                              <Option value="" type="QString" name="val"/>
+                              <Option type="bool" value="false" name="active"/>
+                              <Option type="int" value="1" name="type"/>
+                              <Option type="QString" value="" name="val"/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -3027,35 +3027,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="145,211,55,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.5" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="145,211,55,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.5" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -3086,36 +3086,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="LastVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="3" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="LastVertex" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -3135,40 +3135,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" type="marker" name="@3@2" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+              <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@3@2">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="145,211,55,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="square" name="cap_style"/>
+                    <Option type="QString" value="145,211,55,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="circle" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="0,0,0,0" name="outline_color"/>
+                    <Option type="QString" value="solid" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -3191,38 +3191,38 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="int" value="1" name="type"/>
+                          <Option type="QString" value="" name="val"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="FirstVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="3" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="FirstVertex" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -3242,40 +3242,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" type="marker" name="@3@3" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+              <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@3@3">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="145,211,55,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="square" name="cap_style"/>
+                    <Option type="QString" value="145,211,55,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="circle" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="0,0,0,0" name="outline_color"/>
+                    <Option type="QString" value="solid" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -3298,47 +3298,47 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="int" value="1" name="type"/>
+                          <Option type="QString" value="" name="val"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol is_animated="0" type="line" name="4" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="4">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="500" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="RenderMetersInMapUnits" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="250" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="RenderMetersInMapUnits" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="Interval" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="500" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="RenderMetersInMapUnits" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="250" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="RenderMetersInMapUnits" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="Interval" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -3358,44 +3358,44 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="interval">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="offsetAlongLine">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" type="marker" name="@4@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+              <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@4@0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer locked="0" class="FilledMarker" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="0,72,255,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MapUnit" type="QString" name="offset_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="0,72,255,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="filled_arrowhead" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MapUnit" name="offset_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="0,72,255,255"/>
@@ -3411,32 +3411,32 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol is_animated="0" type="fill" name="@@4@0@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+                  <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@@4@0@0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="0,72,255,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="227,26,28,0" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="0,72,255,255" name="color"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="227,26,28,0" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="0,72,255,255"/>
@@ -3451,15 +3451,15 @@
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option value="false" type="bool" name="active"/>
-                              <Option value="1" type="int" name="type"/>
-                              <Option value="" type="QString" name="val"/>
+                              <Option type="bool" value="false" name="active"/>
+                              <Option type="int" value="1" name="type"/>
+                              <Option type="QString" value="" name="val"/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -3467,35 +3467,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,72,255,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.5" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,72,255,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.5" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -3526,36 +3526,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="LastVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="3" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="LastVertex" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -3575,40 +3575,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" type="marker" name="@4@2" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+              <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@4@2">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="0,72,255,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="square" name="cap_style"/>
+                    <Option type="QString" value="0,72,255,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="circle" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="0,0,0,0" name="outline_color"/>
+                    <Option type="QString" value="solid" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -3631,38 +3631,38 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="int" value="1" name="type"/>
+                          <Option type="QString" value="" name="val"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="FirstVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="3" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="FirstVertex" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -3682,40 +3682,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" type="marker" name="@4@3" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+              <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@4@3">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="0,72,255,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="square" name="cap_style"/>
+                    <Option type="QString" value="0,72,255,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="circle" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="0,0,0,0" name="outline_color"/>
+                    <Option type="QString" value="solid" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -3738,47 +3738,47 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="int" value="1" name="type"/>
+                          <Option type="QString" value="" name="val"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol is_animated="0" type="line" name="5" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="5">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="500" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="RenderMetersInMapUnits" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="250" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="RenderMetersInMapUnits" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="Interval" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="500" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="RenderMetersInMapUnits" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="250" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="RenderMetersInMapUnits" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="Interval" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -3798,44 +3798,44 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="interval">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="offsetAlongLine">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" type="marker" name="@5@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+              <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@5@0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer locked="0" class="FilledMarker" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="0,0,0,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MapUnit" type="QString" name="offset_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="0,0,0,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="filled_arrowhead" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MapUnit" name="offset_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="0,0,0,255"/>
@@ -3851,32 +3851,32 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol is_animated="0" type="fill" name="@@5@0@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+                  <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@@5@0@0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="0,0,0,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="227,26,28,0" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="0,0,0,255" name="color"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="227,26,28,0" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="0,0,0,255"/>
@@ -3891,15 +3891,15 @@
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option value="true" type="bool" name="active"/>
-                              <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                              <Option value="3" type="int" name="type"/>
+                              <Option type="bool" value="true" name="active"/>
+                              <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
+                              <Option type="int" value="3" name="type"/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -3907,35 +3907,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.5" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0,0,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.5" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -3966,36 +3966,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="LastVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="3" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="LastVertex" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -4015,40 +4015,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" type="marker" name="@5@2" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+              <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@5@2">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="0,0,0,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="square" name="cap_style"/>
+                    <Option type="QString" value="0,0,0,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="circle" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="0,0,0,0" name="outline_color"/>
+                    <Option type="QString" value="solid" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -4071,38 +4071,38 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option value="true" type="bool" name="active"/>
-                          <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                          <Option value="3" type="int" name="type"/>
+                          <Option type="bool" value="true" name="active"/>
+                          <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
+                          <Option type="int" value="3" name="type"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="FirstVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="3" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="FirstVertex" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -4122,40 +4122,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" type="marker" name="@5@3" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+              <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@5@3">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="0,0,0,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="square" name="cap_style"/>
+                    <Option type="QString" value="0,0,0,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="circle" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="0,0,0,0" name="outline_color"/>
+                    <Option type="QString" value="solid" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -4178,47 +4178,47 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option value="true" type="bool" name="active"/>
-                          <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                          <Option value="3" type="int" name="type"/>
+                          <Option type="bool" value="true" name="active"/>
+                          <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
+                          <Option type="int" value="3" name="type"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol is_animated="0" type="line" name="6" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="6">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="500" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="RenderMetersInMapUnits" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="250" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="RenderMetersInMapUnits" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="Interval" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="500" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="RenderMetersInMapUnits" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="250" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="RenderMetersInMapUnits" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="Interval" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -4238,44 +4238,44 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="interval">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="offsetAlongLine">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" type="marker" name="@6@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+              <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@6@0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer locked="0" class="FilledMarker" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="210,32,39,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MapUnit" type="QString" name="offset_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="210,32,39,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="filled_arrowhead" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MapUnit" name="offset_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="210,32,39,255"/>
@@ -4291,32 +4291,32 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol is_animated="0" type="fill" name="@@6@0@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+                  <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@@6@0@0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="210,32,39,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="227,26,28,0" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="210,32,39,255" name="color"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="227,26,28,0" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="210,32,39,255"/>
@@ -4331,15 +4331,15 @@
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option value="false" type="bool" name="active"/>
-                              <Option value="1" type="int" name="type"/>
-                              <Option value="" type="QString" name="val"/>
+                              <Option type="bool" value="false" name="active"/>
+                              <Option type="int" value="1" name="type"/>
+                              <Option type="QString" value="" name="val"/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -4347,35 +4347,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="210,32,39,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.5" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="210,32,39,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.5" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -4406,36 +4406,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="LastVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="3" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="LastVertex" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -4455,40 +4455,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" type="marker" name="@6@2" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+              <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@6@2">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="210,32,39,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="square" name="cap_style"/>
+                    <Option type="QString" value="210,32,39,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="circle" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="0,0,0,0" name="outline_color"/>
+                    <Option type="QString" value="solid" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -4511,38 +4511,38 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="int" value="1" name="type"/>
+                          <Option type="QString" value="" name="val"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="FirstVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="3" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="FirstVertex" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -4562,40 +4562,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" type="marker" name="@6@3" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+              <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@6@3">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="210,32,39,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="square" name="cap_style"/>
+                    <Option type="QString" value="210,32,39,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="circle" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="0,0,0,0" name="outline_color"/>
+                    <Option type="QString" value="solid" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -4618,47 +4618,47 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="int" value="1" name="type"/>
+                          <Option type="QString" value="" name="val"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol is_animated="0" type="line" name="7" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="7">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="500" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="RenderMetersInMapUnits" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="250" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="RenderMetersInMapUnits" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="Interval" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="500" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="RenderMetersInMapUnits" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="250" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="RenderMetersInMapUnits" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="Interval" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -4678,44 +4678,44 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="interval">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="offsetAlongLine">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" type="marker" name="@7@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+              <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@7@0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer locked="0" class="FilledMarker" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="103,34,144,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MapUnit" type="QString" name="offset_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="103,34,144,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="filled_arrowhead" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MapUnit" name="offset_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="103,34,144,255"/>
@@ -4731,32 +4731,32 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol is_animated="0" type="fill" name="@@7@0@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+                  <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@@7@0@0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="103,34,144,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="227,26,28,0" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="103,34,144,255" name="color"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="227,26,28,0" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="103,34,144,255"/>
@@ -4771,15 +4771,15 @@
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option value="false" type="bool" name="active"/>
-                              <Option value="1" type="int" name="type"/>
-                              <Option value="" type="QString" name="val"/>
+                              <Option type="bool" value="false" name="active"/>
+                              <Option type="int" value="1" name="type"/>
+                              <Option type="QString" value="" name="val"/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -4787,35 +4787,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="103,34,144,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.5" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="103,34,144,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.5" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -4846,36 +4846,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="LastVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="3" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="LastVertex" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -4895,40 +4895,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" type="marker" name="@7@2" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+              <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@7@2">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="103,34,144,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="square" name="cap_style"/>
+                    <Option type="QString" value="103,34,144,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="circle" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="0,0,0,0" name="outline_color"/>
+                    <Option type="QString" value="solid" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -4951,38 +4951,38 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="int" value="1" name="type"/>
+                          <Option type="QString" value="" name="val"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="FirstVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="3" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="FirstVertex" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -5002,40 +5002,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" type="marker" name="@7@3" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+              <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@7@3">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="103,34,144,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="square" name="cap_style"/>
+                    <Option type="QString" value="103,34,144,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="circle" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="0,0,0,0" name="outline_color"/>
+                    <Option type="QString" value="solid" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -5058,47 +5058,47 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="int" value="1" name="type"/>
+                          <Option type="QString" value="" name="val"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol is_animated="0" type="line" name="8" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="8">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="500" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="RenderMetersInMapUnits" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="250" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="RenderMetersInMapUnits" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="Interval" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="500" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="RenderMetersInMapUnits" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="250" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="RenderMetersInMapUnits" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="Interval" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -5118,44 +5118,44 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="interval">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="offsetAlongLine">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" type="marker" name="@8@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+              <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@8@0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer locked="0" class="FilledMarker" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="145,211,55,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MapUnit" type="QString" name="offset_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="145,211,55,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="filled_arrowhead" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MapUnit" name="offset_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="145,211,55,255"/>
@@ -5171,32 +5171,32 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol is_animated="0" type="fill" name="@@8@0@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+                  <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@@8@0@0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="145,211,55,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="227,26,28,0" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="145,211,55,255" name="color"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="227,26,28,0" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="145,211,55,255"/>
@@ -5211,15 +5211,15 @@
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option value="false" type="bool" name="active"/>
-                              <Option value="1" type="int" name="type"/>
-                              <Option value="" type="QString" name="val"/>
+                              <Option type="bool" value="false" name="active"/>
+                              <Option type="int" value="1" name="type"/>
+                              <Option type="QString" value="" name="val"/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -5227,35 +5227,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="145,211,55,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.5" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="145,211,55,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.5" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -5286,36 +5286,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="LastVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="3" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="LastVertex" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -5335,40 +5335,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" type="marker" name="@8@2" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+              <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@8@2">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="145,211,55,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="square" name="cap_style"/>
+                    <Option type="QString" value="145,211,55,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="circle" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="0,0,0,0" name="outline_color"/>
+                    <Option type="QString" value="solid" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -5391,38 +5391,38 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="int" value="1" name="type"/>
+                          <Option type="QString" value="" name="val"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="FirstVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="3" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="FirstVertex" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -5442,40 +5442,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" type="marker" name="@8@3" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+              <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@8@3">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="145,211,55,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="square" name="cap_style"/>
+                    <Option type="QString" value="145,211,55,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="circle" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="0,0,0,0" name="outline_color"/>
+                    <Option type="QString" value="solid" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -5498,47 +5498,47 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="int" value="1" name="type"/>
+                          <Option type="QString" value="" name="val"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol is_animated="0" type="line" name="9" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="9">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="500" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="RenderMetersInMapUnits" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="250" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="RenderMetersInMapUnits" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="Interval" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="500" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="RenderMetersInMapUnits" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="250" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="RenderMetersInMapUnits" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="Interval" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -5558,44 +5558,44 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="interval">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.04', '250,0' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="offsetAlongLine">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if( regexp_match( attribute( @atlas_feature , 'type' ), '^(fenc|cone|spac|constr|marshal$)' ), @map_scale * '.02', '125,0' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" type="marker" name="@9@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+              <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@9@0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer locked="0" class="FilledMarker" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="0,72,255,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MapUnit" type="QString" name="offset_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="0,72,255,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="filled_arrowhead" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MapUnit" name="offset_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="0,72,255,255"/>
@@ -5611,32 +5611,32 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol is_animated="0" type="fill" name="@@9@0@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+                  <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@@9@0@0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="0,72,255,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="227,26,28,0" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="0,72,255,255" name="color"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="227,26,28,0" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="0,72,255,255"/>
@@ -5651,15 +5651,15 @@
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option value="false" type="bool" name="active"/>
-                              <Option value="1" type="int" name="type"/>
-                              <Option value="" type="QString" name="val"/>
+                              <Option type="bool" value="false" name="active"/>
+                              <Option type="int" value="1" name="type"/>
+                              <Option type="QString" value="" name="val"/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -5667,35 +5667,35 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,72,255,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.5" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,72,255,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.5" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -5726,36 +5726,36 @@
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="LastVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="3" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="LastVertex" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -5775,40 +5775,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" type="marker" name="@9@2" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+              <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@9@2">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="0,72,255,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="square" name="cap_style"/>
+                    <Option type="QString" value="0,72,255,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="circle" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="0,0,0,0" name="outline_color"/>
+                    <Option type="QString" value="solid" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -5831,38 +5831,38 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="int" value="1" name="type"/>
+                          <Option type="QString" value="" name="val"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="FirstVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="3" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="FirstVertex" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -5882,40 +5882,40 @@
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" type="marker" name="@9@3" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+              <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@9@3">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="0,72,255,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="square" name="cap_style"/>
+                    <Option type="QString" value="0,72,255,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="circle" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="0,0,0,0" name="outline_color"/>
+                    <Option type="QString" value="solid" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -5938,15 +5938,15 @@
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="fillColor">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="int" value="1" name="type"/>
+                          <Option type="QString" value="" name="val"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
@@ -5960,42 +5960,42 @@
       </renderer-v2>
       <labeling type="rule-based">
         <rules key="{48fee05e-0ef3-420c-825c-567446ab3f47}">
-          <rule active="0" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" description="Active routes" key="{d02d4209-0412-4f31-93a5-7f588ba53e66}">
+          <rule description="Active routes" active="0" key="{d02d4209-0412-4f31-93a5-7f588ba53e66}" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )">
             <settings calloutType="simple">
-              <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="63" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="255,255,255,255" textOpacity="1" fieldName="round($length / 1000, 0)" useSubstitutions="0" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="10" namedStyle="Semibold" forcedItalic="0" isExpression="1" fontSizeUnit="Point" allowHtml="0" legendString="Aa">
+              <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="Semibold" fontUnderline="0" fieldName="round($length / 1000, 0)" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" useSubstitutions="0" fontWeight="63" fontStrikeout="0" fontItalic="0" fontSize="10" allowHtml="0" fontKerning="1" textColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" isExpression="1" legendString="Aa" textOrientation="horizontal">
                 <families/>
-                <text-buffer bufferNoFill="0" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="0"/>
-                <background shapeRadiiY="1" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="0,0,0,255" shapeDraw="1" shapeBorderWidth="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="1" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="0,0,0,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="1" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-                  <symbol is_animated="0" type="marker" name="markerSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+                <text-buffer bufferNoFill="0" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+                <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskType="0"/>
+                <background shapeRadiiY="1" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="0,0,0,255" shapeRotationType="0" shapeSizeX="1" shapeDraw="1" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="0,0,0,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="1">
+                  <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="markerSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                    <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
                       <Option type="Map">
-                        <Option value="0" type="QString" name="angle"/>
-                        <Option value="square" type="QString" name="cap_style"/>
-                        <Option value="164,113,88,255" type="QString" name="color"/>
-                        <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="circle" type="QString" name="name"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="diameter" type="QString" name="scale_method"/>
-                        <Option value="2" type="QString" name="size"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="size_unit"/>
-                        <Option value="1" type="QString" name="vertical_anchor_point"/>
+                        <Option type="QString" value="0" name="angle"/>
+                        <Option type="QString" value="square" name="cap_style"/>
+                        <Option type="QString" value="164,113,88,255" name="color"/>
+                        <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="circle" name="name"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="diameter" name="scale_method"/>
+                        <Option type="QString" value="2" name="size"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="size_unit"/>
+                        <Option type="QString" value="1" name="vertical_anchor_point"/>
                       </Option>
                       <prop k="angle" v="0"/>
                       <prop k="cap_style" v="square"/>
@@ -6018,34 +6018,34 @@
                       <prop k="vertical_anchor_point" v="1"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+                  <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="0,0,0,255" type="QString" name="color"/>
-                        <Option value="round" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="1" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="0,0,0,255" name="color"/>
+                        <Option type="QString" value="round" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="1" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="0,0,0,255"/>
@@ -6060,98 +6060,98 @@
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option value="true" type="bool" name="active"/>
-                              <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                              <Option value="3" type="int" name="type"/>
+                              <Option type="bool" value="true" name="active"/>
+                              <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
+                              <Option type="int" value="3" name="type"/>
                             </Option>
                             <Option type="Map" name="outlineColor">
-                              <Option value="true" type="bool" name="active"/>
-                              <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                              <Option value="3" type="int" name="type"/>
+                              <Option type="bool" value="true" name="active"/>
+                              <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
+                              <Option type="int" value="3" name="type"/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format useMaxLineLengthForAutoWrap="1" leftDirectionSymbol="&lt;" wrapChar="" multilineAlign="0" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" decimals="0" rightDirectionSymbol=">" formatNumbers="0"/>
-              <placement overlapHandling="AllowOverlapIfRequired" lineAnchorType="0" centroidInside="0" overrunDistance="0" centroidWhole="0" geometryGeneratorEnabled="1" rotationAngle="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" geometryGeneratorType="PointGeometry" quadOffset="3" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="0" xOffset="0" allowDegraded="1" lineAnchorTextPoint="CenterOfText" layerType="LineGeometry" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" maxCurvedCharAngleOut="-20" repeatDistance="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" dist="2" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" distUnits="MM" lineAnchorClipping="0" placementFlags="10" priority="10" overrunDistanceUnit="MM" maxCurvedCharAngleIn="20" geometryGenerator="km_marker()" lineAnchorPercent="0.5" yOffset="0" rotationUnit="AngleDegrees"/>
-              <rendering fontMaxPixelSize="10000" drawLabels="1" mergeLines="0" zIndex="0" upsidedownLabels="0" obstacleFactor="2" scaleVisibility="0" limitNumLabels="0" obstacleType="0" fontLimitPixelSize="0" maxNumLabels="2000" minFeatureSize="0" fontMinPixelSize="3" labelPerPart="0" obstacle="1" scaleMax="10000000" scaleMin="1" unplacedVisibility="0"/>
+              <text-format wrapChar="" rightDirectionSymbol=">" plussign="0" leftDirectionSymbol="&lt;" formatNumbers="0" decimals="0" multilineAlign="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
+              <placement offsetUnits="MapUnit" xOffset="0" maxCurvedCharAngleOut="-20" layerType="LineGeometry" allowDegraded="1" yOffset="0" overlapHandling="AllowOverlapIfRequired" geometryGeneratorType="PointGeometry" geometryGeneratorEnabled="1" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" repeatDistanceUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" quadOffset="3" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidWhole="0" overrunDistance="0" overrunDistanceUnit="MM" centroidInside="0" placement="0" geometryGenerator="km_marker()" priority="10" distUnits="MM" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" dist="2" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorTextPoint="CenterOfText" polygonPlacementFlags="2" rotationUnit="AngleDegrees" offsetType="0" placementFlags="10" repeatDistance="0"/>
+              <rendering limitNumLabels="0" obstacleType="0" obstacle="1" scaleMax="10000000" maxNumLabels="2000" labelPerPart="0" scaleMin="1" upsidedownLabels="0" zIndex="0" unplacedVisibility="0" fontLimitPixelSize="0" minFeatureSize="0" fontMaxPixelSize="10000" scaleVisibility="0" fontMinPixelSize="3" drawLabels="1" mergeLines="0" obstacleFactor="2"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="PositionX">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="PositionY">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="PredefinedPositionOrder">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="quadrant" type="QString" name="field"/>
-                      <Option value="2" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="quadrant" name="field"/>
+                      <Option type="int" value="2" name="type"/>
                     </Option>
                     <Option type="Map" name="Rotation">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="rotation" type="QString" name="field"/>
-                      <Option value="2" type="int" name="type"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="QString" value="rotation" name="field"/>
+                      <Option type="int" value="2" name="type"/>
                     </Option>
                     <Option type="Map" name="ShapeBorderColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="ShapeFillColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+                  <Option type="int" value="0" name="blendMode"/>
                   <Option type="Map" name="ddProperties">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
-                  <Option value="false" type="bool" name="drawToAllParts"/>
-                  <Option value="0" type="QString" name="enabled"/>
-                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                  <Option value="&lt;symbol is_animated=&quot;0&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                  <Option value="0" type="double" name="minLength"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                  <Option value="MM" type="QString" name="minLengthUnit"/>
-                  <Option value="0" type="double" name="offsetFromAnchor"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                  <Option value="0" type="double" name="offsetFromLabel"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                  <Option type="bool" value="false" name="drawToAllParts"/>
+                  <Option type="QString" value="0" name="enabled"/>
+                  <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
+                  <Option type="QString" value="&lt;symbol alpha=&quot;1&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
+                  <Option type="double" value="0" name="minLength"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
+                  <Option type="QString" value="MM" name="minLengthUnit"/>
+                  <Option type="double" value="0" name="offsetFromAnchor"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
+                  <Option type="double" value="0" name="offsetFromLabel"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
@@ -6160,17 +6160,19 @@
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="copy" name="QFieldSync/action"/>
+          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
           <Option type="List" name="dualview/previewExpressions">
-            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
           </Option>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="QString" value="0" name="embeddedWidgets/count"/>
           <Option type="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -6178,48 +6180,48 @@
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory penAlpha="255" width="15" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" minimumSize="0" enabled="0" maxScaleDenominator="1e+08" diagramOrientation="Up" opacity="1" scaleBasedVisibility="0" spacingUnit="MM" minScaleDenominator="100000" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" lineSizeType="MM" penWidth="0" backgroundAlpha="255" scaleDependency="Area" spacing="0" direction="1" barWidth="5" sizeType="MM" height="15" penColor="#000000" showAxis="0">
-          <fontProperties bold="0" style="" italic="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0"/>
-          <attribute label="" colorOpacity="1" field="" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory height="15" scaleDependency="Area" width="15" lineSizeScale="3x:0,0,0,0,0,0" spacingUnit="MM" lineSizeType="MM" penColor="#000000" spacing="0" labelPlacementMethod="XHeight" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" backgroundAlpha="255" maxScaleDenominator="1e+08" barWidth="5" penWidth="0" minimumSize="0" penAlpha="255" minScaleDenominator="100000" sizeType="MM" backgroundColor="#ffffff" enabled="0" opacity="1" direction="1" scaleBasedVisibility="0" showAxis="0" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270">
+          <fontProperties style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0" strikethrough="0" italic="0" underline="0" bold="0"/>
+          <attribute color="#000000" field="" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="35,35,35,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0.26" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -6250,9 +6252,9 @@
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -6260,28 +6262,28 @@
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="2" showAll="1" placement="2" zIndex="0" dist="0" priority="0" obstacle="0">
+      <DiagramLayerSettings priority="0" linePlacementFlags="2" obstacle="0" dist="0" zIndex="0" placement="2" showAll="1">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field configurationFlags="None" name="Name">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -6290,8 +6292,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -6300,8 +6302,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -6310,8 +6312,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -6320,8 +6322,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -6330,8 +6332,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -6340,8 +6342,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -6350,8 +6352,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -6374,8 +6376,8 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -6384,91 +6386,91 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="Name"/>
-        <alias index="1" name="" field="descriptio"/>
-        <alias index="2" name="" field="timestamp"/>
-        <alias index="3" name="" field="begin"/>
-        <alias index="4" name="" field="end"/>
-        <alias index="5" name="" field="Distance"/>
-        <alias index="6" name="" field="RouteLen"/>
-        <alias index="7" name="" field="Source"/>
-        <alias index="8" name="" field="Sort"/>
-        <alias index="9" name="" field="day"/>
-        <alias index="10" name="" field="length_km"/>
-        <alias index="11" name="" field="length_m"/>
+        <alias index="0" field="Name" name=""/>
+        <alias index="1" field="descriptio" name=""/>
+        <alias index="2" field="timestamp" name=""/>
+        <alias index="3" field="begin" name=""/>
+        <alias index="4" field="end" name=""/>
+        <alias index="5" field="Distance" name=""/>
+        <alias index="6" field="RouteLen" name=""/>
+        <alias index="7" field="Source" name=""/>
+        <alias index="8" field="Sort" name=""/>
+        <alias index="9" field="day" name=""/>
+        <alias index="10" field="length_km" name=""/>
+        <alias index="11" field="length_m" name=""/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="Name"/>
-        <default applyOnUpdate="0" expression="" field="descriptio"/>
-        <default applyOnUpdate="0" expression="" field="timestamp"/>
-        <default applyOnUpdate="0" expression="" field="begin"/>
-        <default applyOnUpdate="0" expression="" field="end"/>
-        <default applyOnUpdate="0" expression="" field="Distance"/>
-        <default applyOnUpdate="0" expression="" field="RouteLen"/>
-        <default applyOnUpdate="0" expression="" field="Source"/>
-        <default applyOnUpdate="0" expression="" field="Sort"/>
-        <default applyOnUpdate="0" expression="" field="day"/>
-        <default applyOnUpdate="0" expression="" field="length_km"/>
-        <default applyOnUpdate="0" expression="" field="length_m"/>
+        <default applyOnUpdate="0" field="Name" expression=""/>
+        <default applyOnUpdate="0" field="descriptio" expression=""/>
+        <default applyOnUpdate="0" field="timestamp" expression=""/>
+        <default applyOnUpdate="0" field="begin" expression=""/>
+        <default applyOnUpdate="0" field="end" expression=""/>
+        <default applyOnUpdate="0" field="Distance" expression=""/>
+        <default applyOnUpdate="0" field="RouteLen" expression=""/>
+        <default applyOnUpdate="0" field="Source" expression=""/>
+        <default applyOnUpdate="0" field="Sort" expression=""/>
+        <default applyOnUpdate="0" field="day" expression=""/>
+        <default applyOnUpdate="0" field="length_km" expression=""/>
+        <default applyOnUpdate="0" field="length_m" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="Name" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="descriptio" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="timestamp" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="begin" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="end" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="Distance" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="RouteLen" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="Source" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="Sort" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="day" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="length_km" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="length_m" constraints="0"/>
+        <constraint exp_strength="0" field="Name" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="descriptio" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="timestamp" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="begin" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="end" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="Distance" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="RouteLen" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="Source" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="Sort" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="day" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="length_km" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="length_m" notnull_strength="0" constraints="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" desc="" field="Name"/>
-        <constraint exp="" desc="" field="descriptio"/>
-        <constraint exp="" desc="" field="timestamp"/>
-        <constraint exp="" desc="" field="begin"/>
-        <constraint exp="" desc="" field="end"/>
-        <constraint exp="" desc="" field="Distance"/>
-        <constraint exp="" desc="" field="RouteLen"/>
-        <constraint exp="" desc="" field="Source"/>
-        <constraint exp="" desc="" field="Sort"/>
-        <constraint exp="" desc="" field="day"/>
-        <constraint exp="" desc="" field="length_km"/>
-        <constraint exp="" desc="" field="length_m"/>
+        <constraint exp="" field="Name" desc=""/>
+        <constraint exp="" field="descriptio" desc=""/>
+        <constraint exp="" field="timestamp" desc=""/>
+        <constraint exp="" field="begin" desc=""/>
+        <constraint exp="" field="end" desc=""/>
+        <constraint exp="" field="Distance" desc=""/>
+        <constraint exp="" field="RouteLen" desc=""/>
+        <constraint exp="" field="Source" desc=""/>
+        <constraint exp="" field="Sort" desc=""/>
+        <constraint exp="" field="day" desc=""/>
+        <constraint exp="" field="length_km" desc=""/>
+        <constraint exp="" field="length_m" desc=""/>
       </constraintExpressions>
       <expressionfields>
-        <field typeName="double precision" subType="0" type="6" name="length_km" precision="0" expression="$length * 100" length="-1" comment=""/>
-        <field typeName="double precision" subType="0" type="6" name="length_m" precision="0" expression="$length * 100 * 1000" length="-1" comment=""/>
+        <field precision="0" comment="" type="6" expression="$length * 100" length="-1" subType="0" typeName="double precision" name="length_km"/>
+        <field precision="0" comment="" type="6" expression="$length * 100 * 1000" length="-1" subType="0" typeName="double precision" name="length_m"/>
       </expressionfields>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="1" sortExpression="&quot;length_m&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="&quot;length_m&quot;" sortOrder="1" actionWidgetStyle="dropDown">
         <columns>
-          <column width="152" type="field" name="Name" hidden="0"/>
-          <column width="-1" type="field" name="descriptio" hidden="0"/>
-          <column width="-1" type="field" name="timestamp" hidden="0"/>
-          <column width="163" type="field" name="begin" hidden="0"/>
-          <column width="-1" type="field" name="end" hidden="0"/>
-          <column width="-1" type="field" name="Distance" hidden="0"/>
+          <column width="152" type="field" hidden="0" name="Name"/>
+          <column width="-1" type="field" hidden="0" name="descriptio"/>
+          <column width="-1" type="field" hidden="0" name="timestamp"/>
+          <column width="163" type="field" hidden="0" name="begin"/>
+          <column width="-1" type="field" hidden="0" name="end"/>
+          <column width="-1" type="field" hidden="0" name="Distance"/>
           <column width="-1" type="actions" hidden="1"/>
-          <column width="-1" type="field" name="RouteLen" hidden="0"/>
-          <column width="-1" type="field" name="Source" hidden="0"/>
-          <column width="188" type="field" name="length_m" hidden="0"/>
-          <column width="-1" type="field" name="Sort" hidden="0"/>
-          <column width="-1" type="field" name="day" hidden="0"/>
-          <column width="266" type="field" name="length_km" hidden="0"/>
+          <column width="-1" type="field" hidden="0" name="RouteLen"/>
+          <column width="-1" type="field" hidden="0" name="Source"/>
+          <column width="188" type="field" hidden="0" name="length_m"/>
+          <column width="-1" type="field" hidden="0" name="Sort"/>
+          <column width="-1" type="field" hidden="0" name="day"/>
+          <column width="266" type="field" hidden="0" name="length_km"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -6500,53 +6502,53 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="Distance" editable="1"/>
-        <field name="Name" editable="1"/>
-        <field name="RouteLen" editable="1"/>
-        <field name="Sort" editable="1"/>
-        <field name="Source" editable="1"/>
-        <field name="begin" editable="1"/>
-        <field name="day" editable="1"/>
-        <field name="descriptio" editable="1"/>
-        <field name="end" editable="1"/>
-        <field name="length_km" editable="0"/>
-        <field name="length_m" editable="0"/>
-        <field name="timestamp" editable="1"/>
+        <field editable="1" name="Distance"/>
+        <field editable="1" name="Name"/>
+        <field editable="1" name="RouteLen"/>
+        <field editable="1" name="Sort"/>
+        <field editable="1" name="Source"/>
+        <field editable="1" name="begin"/>
+        <field editable="1" name="day"/>
+        <field editable="1" name="descriptio"/>
+        <field editable="1" name="end"/>
+        <field editable="0" name="length_km"/>
+        <field editable="0" name="length_m"/>
+        <field editable="1" name="timestamp"/>
       </editable>
       <labelOnTop>
-        <field name="Distance" labelOnTop="0"/>
-        <field name="Name" labelOnTop="0"/>
-        <field name="RouteLen" labelOnTop="0"/>
-        <field name="Sort" labelOnTop="0"/>
-        <field name="Source" labelOnTop="0"/>
-        <field name="begin" labelOnTop="0"/>
-        <field name="day" labelOnTop="0"/>
-        <field name="descriptio" labelOnTop="0"/>
-        <field name="end" labelOnTop="0"/>
-        <field name="length_km" labelOnTop="0"/>
-        <field name="length_m" labelOnTop="0"/>
-        <field name="timestamp" labelOnTop="0"/>
+        <field labelOnTop="0" name="Distance"/>
+        <field labelOnTop="0" name="Name"/>
+        <field labelOnTop="0" name="RouteLen"/>
+        <field labelOnTop="0" name="Sort"/>
+        <field labelOnTop="0" name="Source"/>
+        <field labelOnTop="0" name="begin"/>
+        <field labelOnTop="0" name="day"/>
+        <field labelOnTop="0" name="descriptio"/>
+        <field labelOnTop="0" name="end"/>
+        <field labelOnTop="0" name="length_km"/>
+        <field labelOnTop="0" name="length_m"/>
+        <field labelOnTop="0" name="timestamp"/>
       </labelOnTop>
       <reuseLastValue>
-        <field name="Distance" reuseLastValue="0"/>
-        <field name="Name" reuseLastValue="0"/>
-        <field name="RouteLen" reuseLastValue="0"/>
-        <field name="Sort" reuseLastValue="0"/>
-        <field name="Source" reuseLastValue="0"/>
-        <field name="begin" reuseLastValue="0"/>
-        <field name="day" reuseLastValue="0"/>
-        <field name="descriptio" reuseLastValue="0"/>
-        <field name="end" reuseLastValue="0"/>
-        <field name="length_km" reuseLastValue="0"/>
-        <field name="length_m" reuseLastValue="0"/>
-        <field name="timestamp" reuseLastValue="0"/>
+        <field reuseLastValue="0" name="Distance"/>
+        <field reuseLastValue="0" name="Name"/>
+        <field reuseLastValue="0" name="RouteLen"/>
+        <field reuseLastValue="0" name="Sort"/>
+        <field reuseLastValue="0" name="Source"/>
+        <field reuseLastValue="0" name="begin"/>
+        <field reuseLastValue="0" name="day"/>
+        <field reuseLastValue="0" name="descriptio"/>
+        <field reuseLastValue="0" name="end"/>
+        <field reuseLastValue="0" name="length_km"/>
+        <field reuseLastValue="0" name="length_m"/>
+        <field reuseLastValue="0" name="timestamp"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" simplifyLocal="1" autoRefreshTime="0" wkbType="MultiLineString" simplifyDrawingHints="1" type="vector" symbologyReferenceScale="-1" minScale="100000000" legendPlaceholderImage="" refreshOnNotifyEnabled="0" labelsEnabled="0" maxScale="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" refreshOnNotifyMessage="" readOnly="0" geometry="Line" autoRefreshEnabled="0" simplifyDrawingTol="1">
+    <maplayer simplifyLocal="1" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1" legendPlaceholderImage="" symbologyReferenceScale="-1" readOnly="0" refreshOnNotifyEnabled="0" minScale="100000000" maxScale="0" type="vector" autoRefreshTime="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="0" styleCategories="AllStyleCategories" geometry="Line" autoRefreshEnabled="0" wkbType="MultiLineString">
       <extent>
         <xmin>17.99958333333333371</xmin>
         <ymin>-34.00041666666666629</ymin>
@@ -6619,58 +6621,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" startExpression="" mode="0" limitMode="0" endField="" fixedDuration="0" accumulate="0" durationUnit="min" startField="" endExpression="" enabled="0">
+      <temporal durationField="" fixedDuration="0" accumulate="0" endField="" startField="" enabled="0" startExpression="" endExpression="" durationUnit="min" mode="0" limitMode="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" zscale="1" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" binding="Centroid" type="IndividualFeatures" symbology="Line" extrusion="0" zoffset="0">
+      <elevation extrusionEnabled="0" symbology="Line" type="IndividualFeatures" zscale="1" clamping="Terrain" showMarkerSymbolInSurfacePlots="0" zoffset="0" extrusion="0" respectLayerSymbol="1" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="196,60,57,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="196,60,57,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -6701,36 +6703,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="196,60,57,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="140,43,41,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="196,60,57,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="140,43,41,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="196,60,57,255"/>
@@ -6745,44 +6747,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="196,60,57,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="140,43,41,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="196,60,57,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="diamond" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="140,43,41,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="3" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -6805,54 +6807,54 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" type="singleSymbol" symbollevels="0" referencescale="-1" enableorderby="0">
+      <renderer-v2 enableorderby="0" type="singleSymbol" symbollevels="0" referencescale="-1" forceraster="0">
         <symbols>
-          <symbol is_animated="0" type="line" name="0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="183,72,75,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.26" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="183,72,75,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.26" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -6883,9 +6885,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -6896,19 +6898,19 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="copy" name="QFieldSync/action"/>
+          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field configurationFlags="None" name="ID">
@@ -6934,30 +6936,30 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="ID"/>
-        <alias index="1" name="" field="height"/>
-        <alias index="2" name="" field="elevation"/>
+        <alias index="0" field="ID" name=""/>
+        <alias index="1" field="height" name=""/>
+        <alias index="2" field="elevation" name=""/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="ID"/>
-        <default applyOnUpdate="0" expression="" field="height"/>
-        <default applyOnUpdate="0" expression="" field="elevation"/>
+        <default applyOnUpdate="0" field="ID" expression=""/>
+        <default applyOnUpdate="0" field="height" expression=""/>
+        <default applyOnUpdate="0" field="elevation" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="ID" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="height" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="elevation" constraints="0"/>
+        <constraint exp_strength="0" field="ID" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="height" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="elevation" notnull_strength="0" constraints="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" desc="" field="ID"/>
-        <constraint exp="" desc="" field="height"/>
-        <constraint exp="" desc="" field="elevation"/>
+        <constraint exp="" field="ID" desc=""/>
+        <constraint exp="" field="height" desc=""/>
+        <constraint exp="" field="elevation" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns/>
       </attributetableconfig>
       <conditionalstyles>
@@ -6980,7 +6982,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" simplifyLocal="1" autoRefreshTime="0" wkbType="Polygon" simplifyDrawingHints="1" type="vector" symbologyReferenceScale="-1" minScale="100000000" legendPlaceholderImage="" refreshOnNotifyEnabled="0" labelsEnabled="0" maxScale="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" refreshOnNotifyMessage="" readOnly="0" geometry="Polygon" autoRefreshEnabled="0" simplifyDrawingTol="1">
+    <maplayer simplifyLocal="1" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1" legendPlaceholderImage="" symbologyReferenceScale="-1" readOnly="0" refreshOnNotifyEnabled="0" minScale="100000000" maxScale="0" type="vector" autoRefreshTime="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="0" styleCategories="AllStyleCategories" geometry="Polygon" autoRefreshEnabled="0" wkbType="Polygon">
       <extent>
         <xmin>18.36924763341120581</xmin>
         <ymin>-33.95871753779982782</ymin>
@@ -7055,58 +7057,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" startExpression="" mode="0" limitMode="0" endField="" fixedDuration="0" accumulate="0" durationUnit="min" startField="" endExpression="" enabled="0">
+      <temporal durationField="" fixedDuration="0" accumulate="0" endField="" startField="" enabled="0" startExpression="" endExpression="" durationUnit="min" mode="0" limitMode="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" zscale="1" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" binding="Centroid" type="IndividualFeatures" symbology="Line" extrusion="0" zoffset="0">
+      <elevation extrusionEnabled="0" symbology="Line" type="IndividualFeatures" zscale="1" clamping="Terrain" showMarkerSymbolInSurfacePlots="0" zoffset="0" extrusion="0" respectLayerSymbol="1" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="133,182,111,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="133,182,111,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -7137,36 +7139,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="133,182,111,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="95,130,79,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="133,182,111,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="95,130,79,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="133,182,111,255"/>
@@ -7181,44 +7183,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="133,182,111,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="95,130,79,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="133,182,111,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="diamond" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="95,130,79,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="3" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -7241,38 +7243,38 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" type="singleSymbol" symbollevels="0" referencescale="-1" enableorderby="0">
+      <renderer-v2 enableorderby="0" type="singleSymbol" symbollevels="0" referencescale="-1" forceraster="0">
         <symbols>
-          <symbol is_animated="0" type="fill" name="0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="225,89,137,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="225,89,137,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.26" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="225,89,137,255"/>
@@ -7287,9 +7289,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -7300,21 +7302,21 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="no_action" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="no_action" name="QFieldSync/action"/>
+          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks type="StringList">
-          <Option value="" type="QString"/>
+          <Option type="QString" value=""/>
         </activeChecks>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field configurationFlags="None" name="id">
@@ -7347,34 +7349,34 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
-        <alias index="1" name="" field="type"/>
-        <alias index="2" name="" field="page"/>
-        <alias index="3" name="" field="day"/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="type" name=""/>
+        <alias index="2" field="page" name=""/>
+        <alias index="3" field="day" name=""/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="type"/>
-        <default applyOnUpdate="0" expression="" field="page"/>
-        <default applyOnUpdate="0" expression="" field="day"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="type" expression=""/>
+        <default applyOnUpdate="0" field="page" expression=""/>
+        <default applyOnUpdate="0" field="day" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="id" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="type" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="page" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="day" constraints="0"/>
+        <constraint exp_strength="0" field="id" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="type" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="page" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="day" notnull_strength="0" constraints="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" desc="" field="id"/>
-        <constraint exp="" desc="" field="type"/>
-        <constraint exp="" desc="" field="page"/>
-        <constraint exp="" desc="" field="day"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="type" desc=""/>
+        <constraint exp="" field="page" desc=""/>
+        <constraint exp="" field="day" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns/>
       </attributetableconfig>
       <conditionalstyles>
@@ -7397,7 +7399,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" simplifyLocal="1" autoRefreshTime="0" wkbType="MultiLineString" simplifyDrawingHints="1" type="vector" symbologyReferenceScale="-1" minScale="100000000" legendPlaceholderImage="" refreshOnNotifyEnabled="0" labelsEnabled="1" maxScale="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" refreshOnNotifyMessage="" readOnly="0" geometry="Line" autoRefreshEnabled="0" simplifyDrawingTol="1">
+    <maplayer simplifyLocal="1" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1" legendPlaceholderImage="" symbologyReferenceScale="-1" readOnly="0" refreshOnNotifyEnabled="0" minScale="100000000" maxScale="0" type="vector" autoRefreshTime="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="1" styleCategories="AllStyleCategories" geometry="Line" autoRefreshEnabled="0" wkbType="MultiLineString">
       <extent>
         <xmin>18.41275838185438474</xmin>
         <ymin>-33.90124710387746632</ymin>
@@ -7462,7 +7464,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxy="0" minz="0" dimensions="2" maxx="0" maxz="0" miny="0" minx="0" crs=""/>
+          <spatial maxz="0" minx="0" maxx="0" minz="0" crs="" miny="0" maxy="0" dimensions="2"/>
           <temporal>
             <period>
               <start></start>
@@ -7487,58 +7489,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" startExpression="" mode="0" limitMode="0" endField="" fixedDuration="0" accumulate="0" durationUnit="min" startField="" endExpression="" enabled="0">
+      <temporal durationField="" fixedDuration="0" accumulate="0" endField="" startField="" enabled="0" startExpression="" endExpression="" durationUnit="min" mode="0" limitMode="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" zscale="1" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" binding="Centroid" type="IndividualFeatures" symbology="Line" extrusion="0" zoffset="0">
+      <elevation extrusionEnabled="0" symbology="Line" type="IndividualFeatures" zscale="1" clamping="Terrain" showMarkerSymbolInSurfacePlots="0" zoffset="0" extrusion="0" respectLayerSymbol="1" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="190,178,151,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="190,178,151,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -7569,36 +7571,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="190,178,151,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="136,127,108,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="190,178,151,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="136,127,108,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="190,178,151,255"/>
@@ -7613,44 +7615,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="190,178,151,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="136,127,108,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="190,178,151,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="diamond" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="136,127,108,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="3" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -7673,54 +7675,54 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" type="singleSymbol" symbollevels="0" referencescale="-1" enableorderby="0">
+      <renderer-v2 enableorderby="0" type="singleSymbol" symbollevels="0" referencescale="-1" forceraster="0">
         <symbols>
-          <symbol is_animated="0" type="line" name="0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,85,255,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="1" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,85,255,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="1" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -7751,9 +7753,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -7764,32 +7766,32 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="63" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="1" fieldName="Name" useSubstitutions="0" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="10" namedStyle="Semibold" forcedItalic="0" isExpression="0" fontSizeUnit="Point" allowHtml="0" legendString="Aa">
+          <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="Semibold" fontUnderline="0" fieldName="Name" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" useSubstitutions="0" fontWeight="63" fontStrikeout="0" fontItalic="0" fontSize="10" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" isExpression="0" legendString="Aa" textOrientation="horizontal">
             <families/>
-            <text-buffer bufferNoFill="1" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferDraw="1" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="0"/>
-            <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeBorderWidth="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-              <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <text-buffer bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+            <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskType="0"/>
+            <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
+              <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                    <Option value="255,255,255,255" type="QString" name="color"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                    <Option value="no" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="solid" type="QString" name="style"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                    <Option type="QString" value="255,255,255,255" name="color"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                    <Option type="QString" value="no" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="solid" name="style"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -7804,67 +7806,67 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+            <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format useMaxLineLengthForAutoWrap="1" leftDirectionSymbol="&lt;" wrapChar="" multilineAlign="0" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" decimals="3" rightDirectionSymbol=">" formatNumbers="0"/>
-          <placement overlapHandling="PreventOverlap" lineAnchorType="0" centroidInside="0" overrunDistance="0" centroidWhole="0" geometryGeneratorEnabled="0" rotationAngle="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" geometryGeneratorType="LineGeometry" quadOffset="4" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="2" xOffset="0" allowDegraded="0" lineAnchorTextPoint="CenterOfText" layerType="UnknownGeometry" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" maxCurvedCharAngleOut="-25" repeatDistance="0" offsetUnits="MM" repeatDistanceUnits="MM" dist="2" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" distUnits="MM" lineAnchorClipping="0" placementFlags="10" priority="5" overrunDistanceUnit="MM" maxCurvedCharAngleIn="25" geometryGenerator="" lineAnchorPercent="0.5" yOffset="0" rotationUnit="AngleDegrees"/>
-          <rendering fontMaxPixelSize="10000" drawLabels="1" mergeLines="0" zIndex="0" upsidedownLabels="0" obstacleFactor="1" scaleVisibility="0" limitNumLabels="0" obstacleType="0" fontLimitPixelSize="0" maxNumLabels="2000" minFeatureSize="0" fontMinPixelSize="3" labelPerPart="0" obstacle="1" scaleMax="0" scaleMin="0" unplacedVisibility="0"/>
+          <text-format wrapChar="" rightDirectionSymbol=">" plussign="0" leftDirectionSymbol="&lt;" formatNumbers="0" decimals="3" multilineAlign="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
+          <placement offsetUnits="MM" xOffset="0" maxCurvedCharAngleOut="-25" layerType="UnknownGeometry" allowDegraded="0" yOffset="0" overlapHandling="PreventOverlap" geometryGeneratorType="LineGeometry" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" repeatDistanceUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25" quadOffset="4" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidWhole="0" overrunDistance="0" overrunDistanceUnit="MM" centroidInside="0" placement="2" geometryGenerator="" priority="5" distUnits="MM" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" dist="2" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorTextPoint="CenterOfText" polygonPlacementFlags="2" rotationUnit="AngleDegrees" offsetType="0" placementFlags="10" repeatDistance="0"/>
+          <rendering limitNumLabels="0" obstacleType="0" obstacle="1" scaleMax="0" maxNumLabels="2000" labelPerPart="0" scaleMin="0" upsidedownLabels="0" zIndex="0" unplacedVisibility="0" fontLimitPixelSize="0" minFeatureSize="0" fontMaxPixelSize="10000" scaleVisibility="0" fontMinPixelSize="3" drawLabels="1" mergeLines="0" obstacleFactor="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-              <Option value="0" type="int" name="blendMode"/>
+              <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+              <Option type="int" value="0" name="blendMode"/>
               <Option type="Map" name="ddProperties">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
-              <Option value="false" type="bool" name="drawToAllParts"/>
-              <Option value="0" type="QString" name="enabled"/>
-              <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-              <Option value="&lt;symbol is_animated=&quot;0&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-              <Option value="0" type="double" name="minLength"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-              <Option value="MM" type="QString" name="minLengthUnit"/>
-              <Option value="0" type="double" name="offsetFromAnchor"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-              <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-              <Option value="0" type="double" name="offsetFromLabel"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-              <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+              <Option type="bool" value="false" name="drawToAllParts"/>
+              <Option type="QString" value="0" name="enabled"/>
+              <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
+              <Option type="QString" value="&lt;symbol alpha=&quot;1&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
+              <Option type="double" value="0" name="minLength"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
+              <Option type="QString" value="MM" name="minLengthUnit"/>
+              <Option type="double" value="0" name="offsetFromAnchor"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
+              <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
+              <Option type="double" value="0" name="offsetFromLabel"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
+              <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option value="Name" type="QString" name="dualview/previewExpressions"/>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="QString" value="copy" name="QFieldSync/action"/>
+          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="Name" name="dualview/previewExpressions"/>
+          <Option type="QString" value="0" name="embeddedWidgets/count"/>
           <Option type="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -7872,48 +7874,48 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory penAlpha="255" width="15" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" minimumSize="0" enabled="0" maxScaleDenominator="1e+08" diagramOrientation="Up" opacity="1" scaleBasedVisibility="0" spacingUnit="MM" minScaleDenominator="0" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" lineSizeType="MM" penWidth="0" backgroundAlpha="255" scaleDependency="Area" spacing="0" direction="1" barWidth="5" sizeType="MM" height="15" penColor="#000000" showAxis="0">
-          <fontProperties bold="0" style="" italic="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0"/>
-          <attribute label="" colorOpacity="1" field="" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory height="15" scaleDependency="Area" width="15" lineSizeScale="3x:0,0,0,0,0,0" spacingUnit="MM" lineSizeType="MM" penColor="#000000" spacing="0" labelPlacementMethod="XHeight" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" backgroundAlpha="255" maxScaleDenominator="1e+08" barWidth="5" penWidth="0" minimumSize="0" penAlpha="255" minScaleDenominator="0" sizeType="MM" backgroundColor="#ffffff" enabled="0" opacity="1" direction="1" scaleBasedVisibility="0" showAxis="0" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270">
+          <fontProperties style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0" strikethrough="0" italic="0" underline="0" bold="0"/>
+          <attribute color="#000000" field="" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="35,35,35,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0.26" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -7944,9 +7946,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -7954,20 +7956,20 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" showAll="1" placement="2" zIndex="0" dist="0" priority="0" obstacle="0">
+      <DiagramLayerSettings priority="0" linePlacementFlags="18" obstacle="0" dist="0" zIndex="0" placement="2" showAll="1">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field configurationFlags="None" name="id">
@@ -7986,29 +7988,29 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
-        <alias index="1" name="" field="Name"/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="Name" name=""/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="Name"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="Name" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="id" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="Name" constraints="0"/>
+        <constraint exp_strength="0" field="id" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="Name" notnull_strength="0" constraints="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" desc="" field="id"/>
-        <constraint exp="" desc="" field="Name"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="Name" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column width="-1" type="field" name="id" hidden="0"/>
-          <column width="-1" type="field" name="Name" hidden="0"/>
+          <column width="-1" type="field" hidden="0" name="id"/>
+          <column width="-1" type="field" hidden="0" name="Name"/>
           <column width="-1" type="actions" hidden="1"/>
         </columns>
       </attributetableconfig>
@@ -8041,12 +8043,12 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="Name" editable="1"/>
-        <field name="id" editable="1"/>
+        <field editable="1" name="Name"/>
+        <field editable="1" name="id"/>
       </editable>
       <labelOnTop>
-        <field name="Name" labelOnTop="0"/>
-        <field name="id" labelOnTop="0"/>
+        <field labelOnTop="0" name="Name"/>
+        <field labelOnTop="0" name="id"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -8054,7 +8056,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>Name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" simplifyLocal="1" autoRefreshTime="0" wkbType="MultiLineString" simplifyDrawingHints="0" type="vector" symbologyReferenceScale="-1" minScale="100000000" legendPlaceholderImage="" refreshOnNotifyEnabled="0" labelsEnabled="0" maxScale="100000" styleCategories="AllStyleCategories" simplifyAlgorithm="0" refreshOnNotifyMessage="" readOnly="0" geometry="Line" autoRefreshEnabled="0" simplifyDrawingTol="1">
+    <maplayer simplifyLocal="1" simplifyDrawingHints="0" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1" legendPlaceholderImage="" symbologyReferenceScale="-1" readOnly="0" refreshOnNotifyEnabled="0" minScale="100000000" maxScale="100000" type="vector" autoRefreshTime="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="0" styleCategories="AllStyleCategories" geometry="Line" autoRefreshEnabled="0" wkbType="MultiLineString">
       <extent>
         <xmin>18.40814103070666974</xmin>
         <ymin>-33.90827185075657724</ymin>
@@ -8119,7 +8121,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxy="0" minz="0" dimensions="2" maxx="0" maxz="0" miny="0" minx="0" crs=""/>
+          <spatial maxz="0" minx="0" maxx="0" minz="0" crs="" miny="0" maxy="0" dimensions="2"/>
           <temporal>
             <period>
               <start></start>
@@ -8144,58 +8146,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" startExpression="" mode="0" limitMode="0" endField="" fixedDuration="0" accumulate="0" durationUnit="min" startField="" endExpression="" enabled="0">
+      <temporal durationField="" fixedDuration="0" accumulate="0" endField="" startField="" enabled="0" startExpression="" endExpression="" durationUnit="min" mode="0" limitMode="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" zscale="1" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" binding="Centroid" type="IndividualFeatures" symbology="Line" extrusion="0" zoffset="0">
+      <elevation extrusionEnabled="0" symbology="Line" type="IndividualFeatures" zscale="1" clamping="Terrain" showMarkerSymbolInSurfacePlots="0" zoffset="0" extrusion="0" respectLayerSymbol="1" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="145,82,45,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="145,82,45,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -8226,36 +8228,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="145,82,45,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="104,59,32,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="145,82,45,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="104,59,32,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="145,82,45,255"/>
@@ -8270,44 +8272,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="145,82,45,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="104,59,32,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="145,82,45,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="diamond" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="104,59,32,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="3" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -8330,48 +8332,48 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" type="RuleRenderer" symbollevels="0" referencescale="-1" enableorderby="0">
+      <renderer-v2 enableorderby="0" type="RuleRenderer" symbollevels="0" referencescale="-1" forceraster="0">
         <rules key="{cdec7d40-64aa-438c-9c37-b3d2a98670e7}">
-          <rule filter="&quot;distance&quot; = '21KM'" description="Only show when active in Atlas" symbol="0" label="21KM" key="{85adf11b-f941-44b6-8847-c828ab845cdc}"/>
-          <rule filter="&quot;distance&quot; = '10KM'" description="Only show when active in Atlas" symbol="1" label="10KM" key="{78aff69a-52d7-4875-b2ae-48b907117fa1}"/>
-          <rule filter="&quot;distance&quot; = '5KM'" description="Only show when active in Atlas" symbol="2" label="5KM" key="{cf733f0f-ab72-441e-b213-841aa39c1671}"/>
+          <rule description="Only show when active in Atlas" symbol="0" label="21KM" key="{85adf11b-f941-44b6-8847-c828ab845cdc}" filter="&quot;distance&quot; = '21KM'"/>
+          <rule description="Only show when active in Atlas" symbol="1" label="10KM" key="{78aff69a-52d7-4875-b2ae-48b907117fa1}" filter="&quot;distance&quot; = '10KM'"/>
+          <rule description="Only show when active in Atlas" symbol="2" label="5KM" key="{cf733f0f-ab72-441e-b213-841aa39c1671}" filter="&quot;distance&quot; = '5KM'"/>
         </rules>
         <symbols>
-          <symbol is_animated="0" type="line" name="0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="LastVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="3" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="LastVertex" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -8391,40 +8393,40 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" type="marker" name="@0@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+              <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@0@0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="210,32,39,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="miter" type="QString" name="joinstyle"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="210,32,39,255" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0.5" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="area" type="QString" name="scale_method"/>
-                    <Option value="3" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="square" name="cap_style"/>
+                    <Option type="QString" value="210,32,39,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="miter" name="joinstyle"/>
+                    <Option type="QString" value="filled_arrowhead" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="210,32,39,255" name="outline_color"/>
+                    <Option type="QString" value="solid" name="outline_style"/>
+                    <Option type="QString" value="0.5" name="outline_width"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="area" name="scale_method"/>
+                    <Option type="QString" value="3" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -8447,32 +8449,32 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="250" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="100" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="Interval" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="250" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="100" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="Interval" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -8492,44 +8494,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="interval">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="offsetAlongLine">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" type="marker" name="@0@1" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+              <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@0@1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer locked="0" class="FilledMarker" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="210,32,39,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MapUnit" type="QString" name="offset_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="3" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="210,32,39,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="filled_arrowhead" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MapUnit" name="offset_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="3" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="210,32,39,255"/>
@@ -8545,32 +8547,32 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol is_animated="0" type="fill" name="@@0@1@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+                  <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@@0@1@0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="210,32,39,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="26,0,201,0" type="QString" name="outline_color"/>
-                        <Option value="no" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="210,32,39,255" name="color"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="26,0,201,0" name="outline_color"/>
+                        <Option type="QString" value="no" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="210,32,39,255"/>
@@ -8585,9 +8587,9 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -8595,35 +8597,35 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="flat" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="miter" type="QString" name="joinstyle"/>
-                <Option value="210,32,39,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.75" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="flat" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="miter" name="joinstyle"/>
+                <Option type="QString" value="210,32,39,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.75" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="flat"/>
@@ -8654,39 +8656,39 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" type="line" name="1" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="500" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="LastVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="500" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="LastVertex" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -8706,44 +8708,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="interval">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="offsetAlongLine">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" type="marker" name="@1@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+              <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@1@0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer locked="0" class="FilledMarker" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="103,34,144,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="3" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="103,34,144,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="filled_arrowhead" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="3" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="103,34,144,255"/>
@@ -8759,32 +8761,32 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol is_animated="0" type="fill" name="@@1@0@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+                  <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@@1@0@0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="103,34,144,255" type="QString" name="color"/>
-                        <Option value="miter" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="103,34,144,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0.5" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="103,34,144,255" name="color"/>
+                        <Option type="QString" value="miter" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="103,34,144,255" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0.5" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="103,34,144,255"/>
@@ -8799,9 +8801,9 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -8809,24 +8811,24 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="250" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="100" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="Interval" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="250" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="100" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="Interval" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -8846,44 +8848,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="interval">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="offsetAlongLine">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" type="marker" name="@1@1" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+              <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@1@1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer locked="0" class="FilledMarker" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="103,34,144,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="3" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="103,34,144,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="filled_arrowhead" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="3" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="103,34,144,255"/>
@@ -8899,32 +8901,32 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol is_animated="0" type="fill" name="@@1@1@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+                  <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@@1@1@0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="103,34,144,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="26,0,201,0" type="QString" name="outline_color"/>
-                        <Option value="no" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="103,34,144,255" name="color"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="26,0,201,0" name="outline_color"/>
+                        <Option type="QString" value="no" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="103,34,144,255"/>
@@ -8939,9 +8941,9 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -8949,35 +8951,35 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="flat" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="miter" type="QString" name="joinstyle"/>
-                <Option value="103,34,144,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.75" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="flat" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="miter" name="joinstyle"/>
+                <Option type="QString" value="103,34,144,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.75" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="flat"/>
@@ -9008,39 +9010,39 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" type="line" name="2" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="2">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="500" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="LastVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="500" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="LastVertex" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -9060,44 +9062,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="interval">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="offsetAlongLine">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" type="marker" name="@2@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+              <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@2@0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer locked="0" class="FilledMarker" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="69,100,25,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MapUnit" type="QString" name="offset_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="3" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="69,100,25,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="filled_arrowhead" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MapUnit" name="offset_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="3" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="69,100,25,255"/>
@@ -9113,32 +9115,32 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol is_animated="0" type="fill" name="@@2@0@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+                  <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@@2@0@0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="69,100,25,255" type="QString" name="color"/>
-                        <Option value="miter" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="69,100,25,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0.5" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="69,100,25,255" name="color"/>
+                        <Option type="QString" value="miter" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="69,100,25,255" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0.5" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="69,100,25,255"/>
@@ -9153,9 +9155,9 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -9163,24 +9165,24 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="250" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="100" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="Interval" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="250" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="100" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="Interval" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -9200,44 +9202,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="interval">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="offsetAlongLine">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" type="marker" name="@2@1" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+              <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@2@1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer locked="0" class="FilledMarker" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="69,100,25,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MapUnit" type="QString" name="offset_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="3" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="69,100,25,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="filled_arrowhead" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MapUnit" name="offset_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="3" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="69,100,25,255"/>
@@ -9253,32 +9255,32 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol is_animated="0" type="fill" name="@@2@1@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+                  <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@@2@1@0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="69,100,25,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="26,0,201,0" type="QString" name="outline_color"/>
-                        <Option value="no" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="69,100,25,255" name="color"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="26,0,201,0" name="outline_color"/>
+                        <Option type="QString" value="no" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="69,100,25,255"/>
@@ -9293,9 +9295,9 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -9303,35 +9305,35 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="flat" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="miter" type="QString" name="joinstyle"/>
-                <Option value="69,100,25,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.75" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="flat" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="miter" name="joinstyle"/>
+                <Option type="QString" value="69,100,25,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.75" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="flat"/>
@@ -9362,9 +9364,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -9376,11 +9378,11 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString" name="dualview/previewExpressions"/>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="QString" value="copy" name="QFieldSync/action"/>
+          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" name="dualview/previewExpressions"/>
+          <Option type="QString" value="0" name="embeddedWidgets/count"/>
           <Option type="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -9388,48 +9390,48 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory penAlpha="255" width="15" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" minimumSize="0" enabled="0" maxScaleDenominator="1e+08" diagramOrientation="Up" opacity="1" scaleBasedVisibility="0" spacingUnit="MM" minScaleDenominator="100000" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" lineSizeType="MM" penWidth="0" backgroundAlpha="255" scaleDependency="Area" spacing="0" direction="1" barWidth="5" sizeType="MM" height="15" penColor="#000000" showAxis="0">
-          <fontProperties bold="0" style="" italic="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0"/>
-          <attribute label="" colorOpacity="1" field="" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory height="15" scaleDependency="Area" width="15" lineSizeScale="3x:0,0,0,0,0,0" spacingUnit="MM" lineSizeType="MM" penColor="#000000" spacing="0" labelPlacementMethod="XHeight" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" backgroundAlpha="255" maxScaleDenominator="1e+08" barWidth="5" penWidth="0" minimumSize="0" penAlpha="255" minScaleDenominator="100000" sizeType="MM" backgroundColor="#ffffff" enabled="0" opacity="1" direction="1" scaleBasedVisibility="0" showAxis="0" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270">
+          <fontProperties style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0" strikethrough="0" italic="0" underline="0" bold="0"/>
+          <attribute color="#000000" field="" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="35,35,35,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0.26" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -9460,9 +9462,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -9470,20 +9472,20 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="2" showAll="1" placement="2" zIndex="0" dist="0" priority="0" obstacle="0">
+      <DiagramLayerSettings priority="0" linePlacementFlags="2" obstacle="0" dist="0" zIndex="0" placement="2" showAll="1">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field configurationFlags="None" name="id">
@@ -9497,38 +9499,38 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
-        <alias index="1" name="" field="Distance"/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="Distance" name=""/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="Distance"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="Distance" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="id" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="Distance" constraints="0"/>
+        <constraint exp_strength="0" field="id" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="Distance" notnull_strength="0" constraints="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" desc="" field="id"/>
-        <constraint exp="" desc="" field="Distance"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="Distance" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="&quot;Distance&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="&quot;Distance&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column width="-1" type="field" name="Distance" hidden="0"/>
+          <column width="-1" type="field" hidden="0" name="Distance"/>
           <column width="-1" type="actions" hidden="1"/>
-          <column width="-1" type="field" name="id" hidden="0"/>
+          <column width="-1" type="field" hidden="0" name="id"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -9560,30 +9562,30 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="Distance" editable="1"/>
-        <field name="Name" editable="1"/>
-        <field name="RouteLen" editable="1"/>
-        <field name="Source" editable="1"/>
-        <field name="begin" editable="1"/>
-        <field name="descriptio" editable="1"/>
-        <field name="end" editable="1"/>
-        <field name="id" editable="1"/>
-        <field name="length_km" editable="1"/>
-        <field name="length_m" editable="1"/>
-        <field name="timestamp" editable="1"/>
+        <field editable="1" name="Distance"/>
+        <field editable="1" name="Name"/>
+        <field editable="1" name="RouteLen"/>
+        <field editable="1" name="Source"/>
+        <field editable="1" name="begin"/>
+        <field editable="1" name="descriptio"/>
+        <field editable="1" name="end"/>
+        <field editable="1" name="id"/>
+        <field editable="1" name="length_km"/>
+        <field editable="1" name="length_m"/>
+        <field editable="1" name="timestamp"/>
       </editable>
       <labelOnTop>
-        <field name="Distance" labelOnTop="0"/>
-        <field name="Name" labelOnTop="0"/>
-        <field name="RouteLen" labelOnTop="0"/>
-        <field name="Source" labelOnTop="0"/>
-        <field name="begin" labelOnTop="0"/>
-        <field name="descriptio" labelOnTop="0"/>
-        <field name="end" labelOnTop="0"/>
-        <field name="id" labelOnTop="0"/>
-        <field name="length_km" labelOnTop="0"/>
-        <field name="length_m" labelOnTop="0"/>
-        <field name="timestamp" labelOnTop="0"/>
+        <field labelOnTop="0" name="Distance"/>
+        <field labelOnTop="0" name="Name"/>
+        <field labelOnTop="0" name="RouteLen"/>
+        <field labelOnTop="0" name="Source"/>
+        <field labelOnTop="0" name="begin"/>
+        <field labelOnTop="0" name="descriptio"/>
+        <field labelOnTop="0" name="end"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="length_km"/>
+        <field labelOnTop="0" name="length_m"/>
+        <field labelOnTop="0" name="timestamp"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -9591,7 +9593,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" simplifyLocal="1" autoRefreshTime="0" wkbType="Point" simplifyDrawingHints="0" type="vector" symbologyReferenceScale="-1" minScale="100000000" legendPlaceholderImage="" refreshOnNotifyEnabled="0" labelsEnabled="1" maxScale="100000" styleCategories="AllStyleCategories" simplifyAlgorithm="0" refreshOnNotifyMessage="" readOnly="0" geometry="Point" autoRefreshEnabled="0" simplifyDrawingTol="1">
+    <maplayer simplifyLocal="1" simplifyDrawingHints="0" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1" legendPlaceholderImage="" symbologyReferenceScale="-1" readOnly="0" refreshOnNotifyEnabled="0" minScale="100000000" maxScale="100000" type="vector" autoRefreshTime="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="1" styleCategories="AllStyleCategories" geometry="Point" autoRefreshEnabled="0" wkbType="Point">
       <extent>
         <xmin>18.38517016505928936</xmin>
         <ymin>-33.91987011678683217</ymin>
@@ -9664,58 +9666,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" startExpression="" mode="0" limitMode="0" endField="" fixedDuration="0" accumulate="0" durationUnit="min" startField="" endExpression="" enabled="0">
+      <temporal durationField="" fixedDuration="0" accumulate="0" endField="" startField="" enabled="0" startExpression="" endExpression="" durationUnit="min" mode="0" limitMode="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" zscale="1" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" binding="Centroid" type="IndividualFeatures" symbology="Line" extrusion="0" zoffset="0">
+      <elevation extrusionEnabled="0" symbology="Line" type="IndividualFeatures" zscale="1" clamping="Terrain" showMarkerSymbolInSurfacePlots="0" zoffset="0" extrusion="0" respectLayerSymbol="1" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="125,139,143,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="125,139,143,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -9746,36 +9748,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="125,139,143,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="89,99,102,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="125,139,143,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="89,99,102,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="125,139,143,255"/>
@@ -9790,44 +9792,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="125,139,143,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="89,99,102,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="125,139,143,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="diamond" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="89,99,102,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="3" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -9850,46 +9852,46 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" type="singleSymbol" symbollevels="0" referencescale="-1" enableorderby="0">
+      <renderer-v2 enableorderby="0" type="singleSymbol" symbollevels="0" referencescale="-1" forceraster="0">
         <symbols>
-          <symbol is_animated="0" type="marker" name="0" clip_to_extent="1" alpha="0.796078" force_rhr="0" frame_rate="10">
+          <symbol alpha="0.796078" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="227,0,185,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="circle" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0,0,0,0" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="1" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="227,0,185,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="circle" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0,0,0,0" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="1" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -9912,15 +9914,15 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="size">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="if ('marshal plan' = attribute( $atlasfeature , 'type' ), 0, 2)" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="QString" value="if ('marshal plan' = attribute( $atlasfeature , 'type' ), 0, 2)" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -9931,34 +9933,34 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="rule-based">
         <rules key="{de1ff1b5-a53a-4841-835f-57785b684a9d}">
-          <rule filter="'marshal' = attribute( $atlasfeature , 'type' )" description="Show in marshal maps" key="{9ea624c1-7179-4746-8777-84b8008475a1}">
+          <rule description="Show in marshal maps" key="{9ea624c1-7179-4746-8777-84b8008475a1}" filter="'marshal' = attribute( $atlasfeature , 'type' )">
             <settings calloutType="simple">
-              <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="63" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="1" fieldName="position" useSubstitutions="0" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="8" namedStyle="Semibold" forcedItalic="0" isExpression="0" fontSizeUnit="Point" allowHtml="0" legendString="Aa">
+              <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="Semibold" fontUnderline="0" fieldName="position" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" useSubstitutions="0" fontWeight="63" fontStrikeout="0" fontItalic="0" fontSize="8" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" isExpression="0" legendString="Aa" textOrientation="horizontal">
                 <families/>
-                <text-buffer bufferNoFill="0" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="0"/>
-                <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0.20000000000000001" shapeFillColor="255,255,255,255" shapeDraw="1" shapeBorderWidth="0.40000000000000002" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0.20000000000000001" shapeType="3" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="0,0,0,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-                  <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+                <text-buffer bufferNoFill="0" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+                <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskType="0"/>
+                <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="0,0,0,255" shapeRotationType="0" shapeSizeX="0.20000000000000001" shapeDraw="1" shapeType="3" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0.40000000000000002" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0.20000000000000001" shapeRadiiX="0">
+                  <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="255,255,255,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0.4" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="255,255,255,255" name="color"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0.4" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="255,255,255,255"/>
@@ -9973,151 +9975,151 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option value="true" type="bool" name="active"/>
-                              <Option value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" type="QString" name="expression"/>
-                              <Option value="3" type="int" name="type"/>
+                              <Option type="bool" value="true" name="active"/>
+                              <Option type="QString" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" name="expression"/>
+                              <Option type="int" value="3" name="type"/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option type="Map" name="properties">
                       <Option type="Map" name="FontStyle">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" type="QString" name="expression"/>
-                        <Option value="3" type="int" name="type"/>
+                        <Option type="bool" value="false" name="active"/>
+                        <Option type="QString" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" name="expression"/>
+                        <Option type="int" value="3" name="type"/>
                       </Option>
                       <Option type="Map" name="ObstacleFactor">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="if ( $atlasfeatureid = $id, 10, 6 )" type="QString" name="expression"/>
-                        <Option value="3" type="int" name="type"/>
+                        <Option type="bool" value="true" name="active"/>
+                        <Option type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )" name="expression"/>
+                        <Option type="int" value="3" name="type"/>
                       </Option>
                       <Option type="Map" name="Priority">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="if ( $atlasfeatureid = $id, 10, 6 )" type="QString" name="expression"/>
-                        <Option value="3" type="int" name="type"/>
+                        <Option type="bool" value="true" name="active"/>
+                        <Option type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )" name="expression"/>
+                        <Option type="int" value="3" name="type"/>
                       </Option>
                       <Option type="Map" name="Size">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="if ( $atlasfeatureid = $id, 10, 8 )" type="QString" name="expression"/>
-                        <Option value="3" type="int" name="type"/>
+                        <Option type="bool" value="true" name="active"/>
+                        <Option type="QString" value="if ( $atlasfeatureid = $id, 10, 8 )" name="expression"/>
+                        <Option type="int" value="3" name="type"/>
                       </Option>
                       <Option type="Map" name="ZIndex">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="if ( $atlasfeatureid = $id, 10, 6 )" type="QString" name="expression"/>
-                        <Option value="3" type="int" name="type"/>
+                        <Option type="bool" value="true" name="active"/>
+                        <Option type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )" name="expression"/>
+                        <Option type="int" value="3" name="type"/>
                       </Option>
                     </Option>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format useMaxLineLengthForAutoWrap="1" leftDirectionSymbol="&lt;" wrapChar="" multilineAlign="0" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" decimals="3" rightDirectionSymbol=">" formatNumbers="0"/>
-              <placement overlapHandling="AllowOverlapIfRequired" lineAnchorType="0" centroidInside="0" overrunDistance="0" centroidWhole="0" geometryGeneratorEnabled="0" rotationAngle="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" geometryGeneratorType="PointGeometry" quadOffset="4" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="1" xOffset="0" allowDegraded="1" lineAnchorTextPoint="CenterOfText" layerType="UnknownGeometry" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" maxCurvedCharAngleOut="-20" repeatDistance="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" dist="0" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" distUnits="MM" lineAnchorClipping="0" placementFlags="10" priority="8" overrunDistanceUnit="MM" maxCurvedCharAngleIn="20" geometryGenerator="" lineAnchorPercent="0.5" yOffset="0" rotationUnit="AngleDegrees"/>
-              <rendering fontMaxPixelSize="10000" drawLabels="1" mergeLines="0" zIndex="0" upsidedownLabels="0" obstacleFactor="1" scaleVisibility="0" limitNumLabels="0" obstacleType="0" fontLimitPixelSize="0" maxNumLabels="2000" minFeatureSize="0" fontMinPixelSize="3" labelPerPart="0" obstacle="1" scaleMax="10000000" scaleMin="1" unplacedVisibility="0"/>
+              <text-format wrapChar="" rightDirectionSymbol=">" plussign="0" leftDirectionSymbol="&lt;" formatNumbers="0" decimals="3" multilineAlign="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
+              <placement offsetUnits="MapUnit" xOffset="0" maxCurvedCharAngleOut="-20" layerType="UnknownGeometry" allowDegraded="1" yOffset="0" overlapHandling="AllowOverlapIfRequired" geometryGeneratorType="PointGeometry" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" repeatDistanceUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" quadOffset="4" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidWhole="0" overrunDistance="0" overrunDistanceUnit="MM" centroidInside="0" placement="1" geometryGenerator="" priority="8" distUnits="MM" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" dist="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorTextPoint="CenterOfText" polygonPlacementFlags="2" rotationUnit="AngleDegrees" offsetType="0" placementFlags="10" repeatDistance="0"/>
+              <rendering limitNumLabels="0" obstacleType="0" obstacle="1" scaleMax="10000000" maxNumLabels="2000" labelPerPart="0" scaleMin="1" upsidedownLabels="0" zIndex="0" unplacedVisibility="0" fontLimitPixelSize="0" minFeatureSize="0" fontMaxPixelSize="10000" scaleVisibility="0" fontMinPixelSize="3" drawLabels="1" mergeLines="0" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="FontStyle">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="QString" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="ObstacleFactor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if ( $atlasfeatureid = $id, 10, 6 )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="Priority">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if ( $atlasfeatureid = $id, 10, 6 )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="ShapeFillColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="Size">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if ( $atlasfeatureid = $id, 10, 8 )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if ( $atlasfeatureid = $id, 10, 8 )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="ZIndex">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if ( $atlasfeatureid = $id, 10, 6 )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if ( $atlasfeatureid = $id, 10, 6 )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+                  <Option type="int" value="0" name="blendMode"/>
                   <Option type="Map" name="ddProperties">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
-                  <Option value="false" type="bool" name="drawToAllParts"/>
-                  <Option value="0" type="QString" name="enabled"/>
-                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                  <Option value="&lt;symbol is_animated=&quot;0&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                  <Option value="0" type="double" name="minLength"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                  <Option value="MM" type="QString" name="minLengthUnit"/>
-                  <Option value="0" type="double" name="offsetFromAnchor"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                  <Option value="0" type="double" name="offsetFromLabel"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                  <Option type="bool" value="false" name="drawToAllParts"/>
+                  <Option type="QString" value="0" name="enabled"/>
+                  <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
+                  <Option type="QString" value="&lt;symbol alpha=&quot;1&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
+                  <Option type="double" value="0" name="minLength"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
+                  <Option type="QString" value="MM" name="minLengthUnit"/>
+                  <Option type="double" value="0" name="offsetFromAnchor"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
+                  <Option type="double" value="0" name="offsetFromLabel"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule filter="'marshal plan' = attribute( $atlasfeature , 'type' )" description="Show in marshal overview" key="{df44d75f-ef99-453d-ab36-57ffc3b9d443}">
+          <rule description="Show in marshal overview" key="{df44d75f-ef99-453d-ab36-57ffc3b9d443}" filter="'marshal plan' = attribute( $atlasfeature , 'type' )">
             <settings calloutType="simple">
-              <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="63" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="227,0,185,255" textOpacity="0.90000000000000002" fieldName="position" useSubstitutions="0" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="4" namedStyle="Semibold" forcedItalic="0" isExpression="0" fontSizeUnit="Point" allowHtml="0" legendString="Aa">
+              <text-style textOpacity="0.90000000000000002" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="Semibold" fontUnderline="0" fieldName="position" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" useSubstitutions="0" fontWeight="63" fontStrikeout="0" fontItalic="0" fontSize="4" allowHtml="0" fontKerning="1" textColor="227,0,185,255" fontFamily="Myriad Pro" capitalization="0" isExpression="0" legendString="Aa" textOrientation="horizontal">
                 <families/>
-                <text-buffer bufferNoFill="0" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="0"/>
-                <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeDraw="1" shapeBorderWidth="0.10000000000000001" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0" shapeType="3" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="0,0,0,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="0.5" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-                  <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+                <text-buffer bufferNoFill="0" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+                <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskType="0"/>
+                <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="0,0,0,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="1" shapeType="3" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0.10000000000000001" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="0.5" shapeSizeY="0" shapeRadiiX="0">
+                  <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="255,255,255,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0.1" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="255,255,255,255" name="color"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0.1" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="255,255,255,255"/>
@@ -10132,89 +10134,89 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option value="false" type="bool" name="active"/>
-                              <Option value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" type="QString" name="expression"/>
-                              <Option value="3" type="int" name="type"/>
+                              <Option type="bool" value="false" name="active"/>
+                              <Option type="QString" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" name="expression"/>
+                              <Option type="int" value="3" name="type"/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option type="Map" name="properties">
                       <Option type="Map" name="FontStyle">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" type="QString" name="expression"/>
-                        <Option value="3" type="int" name="type"/>
+                        <Option type="bool" value="false" name="active"/>
+                        <Option type="QString" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" name="expression"/>
+                        <Option type="int" value="3" name="type"/>
                       </Option>
                       <Option type="Map" name="Size">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="if ( $atlasfeatureid = $id, 10, 8 )" type="QString" name="expression"/>
-                        <Option value="3" type="int" name="type"/>
+                        <Option type="bool" value="false" name="active"/>
+                        <Option type="QString" value="if ( $atlasfeatureid = $id, 10, 8 )" name="expression"/>
+                        <Option type="int" value="3" name="type"/>
                       </Option>
                     </Option>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format useMaxLineLengthForAutoWrap="1" leftDirectionSymbol="&lt;" wrapChar="" multilineAlign="0" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" decimals="3" rightDirectionSymbol=">" formatNumbers="0"/>
-              <placement overlapHandling="AllowOverlapIfRequired" lineAnchorType="0" centroidInside="0" overrunDistance="0" centroidWhole="0" geometryGeneratorEnabled="0" rotationAngle="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" geometryGeneratorType="PointGeometry" quadOffset="4" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="6" xOffset="0" allowDegraded="1" lineAnchorTextPoint="CenterOfText" layerType="UnknownGeometry" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" maxCurvedCharAngleOut="-20" repeatDistance="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" dist="1" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" distUnits="MM" lineAnchorClipping="0" placementFlags="10" priority="10" overrunDistanceUnit="MM" maxCurvedCharAngleIn="20" geometryGenerator="" lineAnchorPercent="0.5" yOffset="0" rotationUnit="AngleDegrees"/>
-              <rendering fontMaxPixelSize="10000" drawLabels="1" mergeLines="0" zIndex="2" upsidedownLabels="0" obstacleFactor="1" scaleVisibility="0" limitNumLabels="0" obstacleType="0" fontLimitPixelSize="0" maxNumLabels="2000" minFeatureSize="0" fontMinPixelSize="3" labelPerPart="0" obstacle="0" scaleMax="10000000" scaleMin="1" unplacedVisibility="0"/>
+              <text-format wrapChar="" rightDirectionSymbol=">" plussign="0" leftDirectionSymbol="&lt;" formatNumbers="0" decimals="3" multilineAlign="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
+              <placement offsetUnits="MapUnit" xOffset="0" maxCurvedCharAngleOut="-20" layerType="UnknownGeometry" allowDegraded="1" yOffset="0" overlapHandling="AllowOverlapIfRequired" geometryGeneratorType="PointGeometry" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" repeatDistanceUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" quadOffset="4" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidWhole="0" overrunDistance="0" overrunDistanceUnit="MM" centroidInside="0" placement="6" geometryGenerator="" priority="10" distUnits="MM" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" dist="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorTextPoint="CenterOfText" polygonPlacementFlags="2" rotationUnit="AngleDegrees" offsetType="0" placementFlags="10" repeatDistance="0"/>
+              <rendering limitNumLabels="0" obstacleType="0" obstacle="0" scaleMax="10000000" maxNumLabels="2000" labelPerPart="0" scaleMin="1" upsidedownLabels="0" zIndex="2" unplacedVisibility="0" fontLimitPixelSize="0" minFeatureSize="0" fontMaxPixelSize="10000" scaleVisibility="0" fontMinPixelSize="3" drawLabels="1" mergeLines="0" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="FontStyle">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="QString" value="if ( $atlasfeatureid = $id, 'Semibold', 'Regular' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="ShapeFillColor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="QString" value="if ( $atlasfeatureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="Size">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="if ( $atlasfeatureid = $id, 10, 8 )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="QString" value="if ( $atlasfeatureid = $id, 10, 8 )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+                  <Option type="int" value="0" name="blendMode"/>
                   <Option type="Map" name="ddProperties">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
-                  <Option value="false" type="bool" name="drawToAllParts"/>
-                  <Option value="0" type="QString" name="enabled"/>
-                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                  <Option value="&lt;symbol is_animated=&quot;0&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                  <Option value="0" type="double" name="minLength"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                  <Option value="MM" type="QString" name="minLengthUnit"/>
-                  <Option value="0" type="double" name="offsetFromAnchor"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                  <Option value="0" type="double" name="offsetFromLabel"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                  <Option type="bool" value="false" name="drawToAllParts"/>
+                  <Option type="QString" value="0" name="enabled"/>
+                  <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
+                  <Option type="QString" value="&lt;symbol alpha=&quot;1&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
+                  <Option type="double" value="0" name="minLength"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
+                  <Option type="QString" value="MM" name="minLengthUnit"/>
+                  <Option type="double" value="0" name="offsetFromAnchor"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
+                  <Option type="double" value="0" name="offsetFromLabel"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
@@ -10223,145 +10225,145 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
-          <Option value="false" type="QString" name="labeling/addDirectionSymbol"/>
-          <Option value="0" type="QString" name="labeling/angleOffset"/>
-          <Option value="0" type="QString" name="labeling/blendMode"/>
-          <Option value="0" type="QString" name="labeling/bufferBlendMode"/>
-          <Option value="255" type="QString" name="labeling/bufferColorA"/>
-          <Option value="255" type="QString" name="labeling/bufferColorB"/>
-          <Option value="255" type="QString" name="labeling/bufferColorG"/>
-          <Option value="255" type="QString" name="labeling/bufferColorR"/>
-          <Option value="false" type="QString" name="labeling/bufferDraw"/>
-          <Option value="64" type="QString" name="labeling/bufferJoinStyle"/>
-          <Option value="false" type="QString" name="labeling/bufferNoFill"/>
-          <Option value="1" type="QString" name="labeling/bufferSize"/>
-          <Option value="false" type="QString" name="labeling/bufferSizeInMapUnits"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/bufferSizeMapUnitScale"/>
-          <Option value="0" type="QString" name="labeling/bufferTransp"/>
-          <Option value="false" type="QString" name="labeling/centroidInside"/>
-          <Option value="false" type="QString" name="labeling/centroidWhole"/>
-          <Option value="3" type="QString" name="labeling/decimals"/>
-          <Option value="false" type="QString" name="labeling/displayAll"/>
-          <Option value="0" type="QString" name="labeling/dist"/>
-          <Option value="false" type="QString" name="labeling/distInMapUnits"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/distMapUnitScale"/>
-          <Option value="false" type="QString" name="labeling/drawLabels"/>
-          <Option value="false" type="QString" name="labeling/enabled"/>
-          <Option value="position" type="QString" name="labeling/fieldName"/>
-          <Option value="false" type="QString" name="labeling/fitInPolygonOnly"/>
-          <Option value="0" type="QString" name="labeling/fontCapitals"/>
-          <Option value="Myriad Pro" type="QString" name="labeling/fontFamily"/>
-          <Option value="false" type="QString" name="labeling/fontItalic"/>
-          <Option value="0" type="QString" name="labeling/fontLetterSpacing"/>
-          <Option value="false" type="QString" name="labeling/fontLimitPixelSize"/>
-          <Option value="10000" type="QString" name="labeling/fontMaxPixelSize"/>
-          <Option value="3" type="QString" name="labeling/fontMinPixelSize"/>
-          <Option value="10" type="QString" name="labeling/fontSize"/>
-          <Option value="false" type="QString" name="labeling/fontSizeInMapUnits"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/fontSizeMapUnitScale"/>
-          <Option value="false" type="QString" name="labeling/fontStrikeout"/>
-          <Option value="false" type="QString" name="labeling/fontUnderline"/>
-          <Option value="63" type="QString" name="labeling/fontWeight"/>
-          <Option value="0" type="QString" name="labeling/fontWordSpacing"/>
-          <Option value="false" type="QString" name="labeling/formatNumbers"/>
-          <Option value="false" type="QString" name="labeling/isExpression"/>
-          <Option value="true" type="QString" name="labeling/labelOffsetInMapUnits"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/labelOffsetMapUnitScale"/>
-          <Option value="false" type="QString" name="labeling/labelPerPart"/>
-          <Option value="&lt;" type="QString" name="labeling/leftDirectionSymbol"/>
-          <Option value="false" type="QString" name="labeling/limitNumLabels"/>
-          <Option value="20" type="QString" name="labeling/maxCurvedCharAngleIn"/>
-          <Option value="-20" type="QString" name="labeling/maxCurvedCharAngleOut"/>
-          <Option value="2000" type="QString" name="labeling/maxNumLabels"/>
-          <Option value="false" type="QString" name="labeling/mergeLines"/>
-          <Option value="0" type="QString" name="labeling/minFeatureSize"/>
-          <Option value="0" type="QString" name="labeling/multilineAlign"/>
-          <Option value="1" type="QString" name="labeling/multilineHeight"/>
-          <Option value="Semibold" type="QString" name="labeling/namedStyle"/>
-          <Option value="true" type="QString" name="labeling/obstacle"/>
-          <Option value="1" type="QString" name="labeling/obstacleFactor"/>
-          <Option value="0" type="QString" name="labeling/obstacleType"/>
-          <Option value="0" type="QString" name="labeling/offsetType"/>
-          <Option value="0" type="QString" name="labeling/placeDirectionSymbol"/>
-          <Option value="0" type="QString" name="labeling/placement"/>
-          <Option value="10" type="QString" name="labeling/placementFlags"/>
-          <Option value="false" type="QString" name="labeling/plussign"/>
-          <Option value="TR,TL,BR,BL,R,L,TSR,BSR" type="QString" name="labeling/predefinedPositionOrder"/>
-          <Option value="true" type="QString" name="labeling/preserveRotation"/>
-          <Option value="#ffffff" type="QString" name="labeling/previewBkgrdColor"/>
-          <Option value="5" type="QString" name="labeling/priority"/>
-          <Option value="4" type="QString" name="labeling/quadOffset"/>
-          <Option value="0" type="QString" name="labeling/repeatDistance"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/repeatDistanceMapUnitScale"/>
-          <Option value="1" type="QString" name="labeling/repeatDistanceUnit"/>
-          <Option value="false" type="QString" name="labeling/reverseDirectionSymbol"/>
-          <Option value=">" type="QString" name="labeling/rightDirectionSymbol"/>
-          <Option value="10000000" type="QString" name="labeling/scaleMax"/>
-          <Option value="1" type="QString" name="labeling/scaleMin"/>
-          <Option value="false" type="QString" name="labeling/scaleVisibility"/>
-          <Option value="6" type="QString" name="labeling/shadowBlendMode"/>
-          <Option value="0" type="QString" name="labeling/shadowColorB"/>
-          <Option value="0" type="QString" name="labeling/shadowColorG"/>
-          <Option value="0" type="QString" name="labeling/shadowColorR"/>
-          <Option value="false" type="QString" name="labeling/shadowDraw"/>
-          <Option value="135" type="QString" name="labeling/shadowOffsetAngle"/>
-          <Option value="1" type="QString" name="labeling/shadowOffsetDist"/>
-          <Option value="true" type="QString" name="labeling/shadowOffsetGlobal"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shadowOffsetMapUnitScale"/>
-          <Option value="1" type="QString" name="labeling/shadowOffsetUnits"/>
-          <Option value="1.5" type="QString" name="labeling/shadowRadius"/>
-          <Option value="false" type="QString" name="labeling/shadowRadiusAlphaOnly"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shadowRadiusMapUnitScale"/>
-          <Option value="1" type="QString" name="labeling/shadowRadiusUnits"/>
-          <Option value="100" type="QString" name="labeling/shadowScale"/>
-          <Option value="30" type="QString" name="labeling/shadowTransparency"/>
-          <Option value="0" type="QString" name="labeling/shadowUnder"/>
-          <Option value="0" type="QString" name="labeling/shapeBlendMode"/>
-          <Option value="255" type="QString" name="labeling/shapeBorderColorA"/>
-          <Option value="128" type="QString" name="labeling/shapeBorderColorB"/>
-          <Option value="128" type="QString" name="labeling/shapeBorderColorG"/>
-          <Option value="128" type="QString" name="labeling/shapeBorderColorR"/>
-          <Option value="0" type="QString" name="labeling/shapeBorderWidth"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shapeBorderWidthMapUnitScale"/>
-          <Option value="1" type="QString" name="labeling/shapeBorderWidthUnits"/>
-          <Option value="true" type="QString" name="labeling/shapeDraw"/>
-          <Option value="255" type="QString" name="labeling/shapeFillColorA"/>
-          <Option value="138" type="QString" name="labeling/shapeFillColorB"/>
-          <Option value="0" type="QString" name="labeling/shapeFillColorG"/>
-          <Option value="101" type="QString" name="labeling/shapeFillColorR"/>
-          <Option value="64" type="QString" name="labeling/shapeJoinStyle"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shapeOffsetMapUnitScale"/>
-          <Option value="1" type="QString" name="labeling/shapeOffsetUnits"/>
-          <Option value="0" type="QString" name="labeling/shapeOffsetX"/>
-          <Option value="0" type="QString" name="labeling/shapeOffsetY"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shapeRadiiMapUnitScale"/>
-          <Option value="1" type="QString" name="labeling/shapeRadiiUnits"/>
-          <Option value="0" type="QString" name="labeling/shapeRadiiX"/>
-          <Option value="0" type="QString" name="labeling/shapeRadiiY"/>
-          <Option value="0" type="QString" name="labeling/shapeRotation"/>
-          <Option value="0" type="QString" name="labeling/shapeRotationType"/>
-          <Option value="" type="QString" name="labeling/shapeSVGFile"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shapeSizeMapUnitScale"/>
-          <Option value="0" type="QString" name="labeling/shapeSizeType"/>
-          <Option value="1" type="QString" name="labeling/shapeSizeUnits"/>
-          <Option value="0" type="QString" name="labeling/shapeSizeX"/>
-          <Option value="0" type="QString" name="labeling/shapeSizeY"/>
-          <Option value="0" type="QString" name="labeling/shapeTransparency"/>
-          <Option value="0" type="QString" name="labeling/shapeType"/>
-          <Option value="255" type="QString" name="labeling/textColorA"/>
-          <Option value="255" type="QString" name="labeling/textColorB"/>
-          <Option value="255" type="QString" name="labeling/textColorG"/>
-          <Option value="255" type="QString" name="labeling/textColorR"/>
-          <Option value="0" type="QString" name="labeling/textTransp"/>
-          <Option value="0" type="QString" name="labeling/upsidedownLabels"/>
-          <Option value="" type="QString" name="labeling/wrapChar"/>
-          <Option value="0" type="QString" name="labeling/xOffset"/>
-          <Option value="0" type="QString" name="labeling/yOffset"/>
-          <Option value="0" type="QString" name="labeling/zIndex"/>
+          <Option type="QString" value="copy" name="QFieldSync/action"/>
+          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="0" name="embeddedWidgets/count"/>
+          <Option type="QString" value="false" name="labeling/addDirectionSymbol"/>
+          <Option type="QString" value="0" name="labeling/angleOffset"/>
+          <Option type="QString" value="0" name="labeling/blendMode"/>
+          <Option type="QString" value="0" name="labeling/bufferBlendMode"/>
+          <Option type="QString" value="255" name="labeling/bufferColorA"/>
+          <Option type="QString" value="255" name="labeling/bufferColorB"/>
+          <Option type="QString" value="255" name="labeling/bufferColorG"/>
+          <Option type="QString" value="255" name="labeling/bufferColorR"/>
+          <Option type="QString" value="false" name="labeling/bufferDraw"/>
+          <Option type="QString" value="64" name="labeling/bufferJoinStyle"/>
+          <Option type="QString" value="false" name="labeling/bufferNoFill"/>
+          <Option type="QString" value="1" name="labeling/bufferSize"/>
+          <Option type="QString" value="false" name="labeling/bufferSizeInMapUnits"/>
+          <Option type="QString" value="0,0,0,0,0,0" name="labeling/bufferSizeMapUnitScale"/>
+          <Option type="QString" value="0" name="labeling/bufferTransp"/>
+          <Option type="QString" value="false" name="labeling/centroidInside"/>
+          <Option type="QString" value="false" name="labeling/centroidWhole"/>
+          <Option type="QString" value="3" name="labeling/decimals"/>
+          <Option type="QString" value="false" name="labeling/displayAll"/>
+          <Option type="QString" value="0" name="labeling/dist"/>
+          <Option type="QString" value="false" name="labeling/distInMapUnits"/>
+          <Option type="QString" value="0,0,0,0,0,0" name="labeling/distMapUnitScale"/>
+          <Option type="QString" value="false" name="labeling/drawLabels"/>
+          <Option type="QString" value="false" name="labeling/enabled"/>
+          <Option type="QString" value="position" name="labeling/fieldName"/>
+          <Option type="QString" value="false" name="labeling/fitInPolygonOnly"/>
+          <Option type="QString" value="0" name="labeling/fontCapitals"/>
+          <Option type="QString" value="Myriad Pro" name="labeling/fontFamily"/>
+          <Option type="QString" value="false" name="labeling/fontItalic"/>
+          <Option type="QString" value="0" name="labeling/fontLetterSpacing"/>
+          <Option type="QString" value="false" name="labeling/fontLimitPixelSize"/>
+          <Option type="QString" value="10000" name="labeling/fontMaxPixelSize"/>
+          <Option type="QString" value="3" name="labeling/fontMinPixelSize"/>
+          <Option type="QString" value="10" name="labeling/fontSize"/>
+          <Option type="QString" value="false" name="labeling/fontSizeInMapUnits"/>
+          <Option type="QString" value="0,0,0,0,0,0" name="labeling/fontSizeMapUnitScale"/>
+          <Option type="QString" value="false" name="labeling/fontStrikeout"/>
+          <Option type="QString" value="false" name="labeling/fontUnderline"/>
+          <Option type="QString" value="63" name="labeling/fontWeight"/>
+          <Option type="QString" value="0" name="labeling/fontWordSpacing"/>
+          <Option type="QString" value="false" name="labeling/formatNumbers"/>
+          <Option type="QString" value="false" name="labeling/isExpression"/>
+          <Option type="QString" value="true" name="labeling/labelOffsetInMapUnits"/>
+          <Option type="QString" value="0,0,0,0,0,0" name="labeling/labelOffsetMapUnitScale"/>
+          <Option type="QString" value="false" name="labeling/labelPerPart"/>
+          <Option type="QString" value="&lt;" name="labeling/leftDirectionSymbol"/>
+          <Option type="QString" value="false" name="labeling/limitNumLabels"/>
+          <Option type="QString" value="20" name="labeling/maxCurvedCharAngleIn"/>
+          <Option type="QString" value="-20" name="labeling/maxCurvedCharAngleOut"/>
+          <Option type="QString" value="2000" name="labeling/maxNumLabels"/>
+          <Option type="QString" value="false" name="labeling/mergeLines"/>
+          <Option type="QString" value="0" name="labeling/minFeatureSize"/>
+          <Option type="QString" value="0" name="labeling/multilineAlign"/>
+          <Option type="QString" value="1" name="labeling/multilineHeight"/>
+          <Option type="QString" value="Semibold" name="labeling/namedStyle"/>
+          <Option type="QString" value="true" name="labeling/obstacle"/>
+          <Option type="QString" value="1" name="labeling/obstacleFactor"/>
+          <Option type="QString" value="0" name="labeling/obstacleType"/>
+          <Option type="QString" value="0" name="labeling/offsetType"/>
+          <Option type="QString" value="0" name="labeling/placeDirectionSymbol"/>
+          <Option type="QString" value="0" name="labeling/placement"/>
+          <Option type="QString" value="10" name="labeling/placementFlags"/>
+          <Option type="QString" value="false" name="labeling/plussign"/>
+          <Option type="QString" value="TR,TL,BR,BL,R,L,TSR,BSR" name="labeling/predefinedPositionOrder"/>
+          <Option type="QString" value="true" name="labeling/preserveRotation"/>
+          <Option type="QString" value="#ffffff" name="labeling/previewBkgrdColor"/>
+          <Option type="QString" value="5" name="labeling/priority"/>
+          <Option type="QString" value="4" name="labeling/quadOffset"/>
+          <Option type="QString" value="0" name="labeling/repeatDistance"/>
+          <Option type="QString" value="0,0,0,0,0,0" name="labeling/repeatDistanceMapUnitScale"/>
+          <Option type="QString" value="1" name="labeling/repeatDistanceUnit"/>
+          <Option type="QString" value="false" name="labeling/reverseDirectionSymbol"/>
+          <Option type="QString" value=">" name="labeling/rightDirectionSymbol"/>
+          <Option type="QString" value="10000000" name="labeling/scaleMax"/>
+          <Option type="QString" value="1" name="labeling/scaleMin"/>
+          <Option type="QString" value="false" name="labeling/scaleVisibility"/>
+          <Option type="QString" value="6" name="labeling/shadowBlendMode"/>
+          <Option type="QString" value="0" name="labeling/shadowColorB"/>
+          <Option type="QString" value="0" name="labeling/shadowColorG"/>
+          <Option type="QString" value="0" name="labeling/shadowColorR"/>
+          <Option type="QString" value="false" name="labeling/shadowDraw"/>
+          <Option type="QString" value="135" name="labeling/shadowOffsetAngle"/>
+          <Option type="QString" value="1" name="labeling/shadowOffsetDist"/>
+          <Option type="QString" value="true" name="labeling/shadowOffsetGlobal"/>
+          <Option type="QString" value="0,0,0,0,0,0" name="labeling/shadowOffsetMapUnitScale"/>
+          <Option type="QString" value="1" name="labeling/shadowOffsetUnits"/>
+          <Option type="QString" value="1.5" name="labeling/shadowRadius"/>
+          <Option type="QString" value="false" name="labeling/shadowRadiusAlphaOnly"/>
+          <Option type="QString" value="0,0,0,0,0,0" name="labeling/shadowRadiusMapUnitScale"/>
+          <Option type="QString" value="1" name="labeling/shadowRadiusUnits"/>
+          <Option type="QString" value="100" name="labeling/shadowScale"/>
+          <Option type="QString" value="30" name="labeling/shadowTransparency"/>
+          <Option type="QString" value="0" name="labeling/shadowUnder"/>
+          <Option type="QString" value="0" name="labeling/shapeBlendMode"/>
+          <Option type="QString" value="255" name="labeling/shapeBorderColorA"/>
+          <Option type="QString" value="128" name="labeling/shapeBorderColorB"/>
+          <Option type="QString" value="128" name="labeling/shapeBorderColorG"/>
+          <Option type="QString" value="128" name="labeling/shapeBorderColorR"/>
+          <Option type="QString" value="0" name="labeling/shapeBorderWidth"/>
+          <Option type="QString" value="0,0,0,0,0,0" name="labeling/shapeBorderWidthMapUnitScale"/>
+          <Option type="QString" value="1" name="labeling/shapeBorderWidthUnits"/>
+          <Option type="QString" value="true" name="labeling/shapeDraw"/>
+          <Option type="QString" value="255" name="labeling/shapeFillColorA"/>
+          <Option type="QString" value="138" name="labeling/shapeFillColorB"/>
+          <Option type="QString" value="0" name="labeling/shapeFillColorG"/>
+          <Option type="QString" value="101" name="labeling/shapeFillColorR"/>
+          <Option type="QString" value="64" name="labeling/shapeJoinStyle"/>
+          <Option type="QString" value="0,0,0,0,0,0" name="labeling/shapeOffsetMapUnitScale"/>
+          <Option type="QString" value="1" name="labeling/shapeOffsetUnits"/>
+          <Option type="QString" value="0" name="labeling/shapeOffsetX"/>
+          <Option type="QString" value="0" name="labeling/shapeOffsetY"/>
+          <Option type="QString" value="0,0,0,0,0,0" name="labeling/shapeRadiiMapUnitScale"/>
+          <Option type="QString" value="1" name="labeling/shapeRadiiUnits"/>
+          <Option type="QString" value="0" name="labeling/shapeRadiiX"/>
+          <Option type="QString" value="0" name="labeling/shapeRadiiY"/>
+          <Option type="QString" value="0" name="labeling/shapeRotation"/>
+          <Option type="QString" value="0" name="labeling/shapeRotationType"/>
+          <Option type="QString" value="" name="labeling/shapeSVGFile"/>
+          <Option type="QString" value="0,0,0,0,0,0" name="labeling/shapeSizeMapUnitScale"/>
+          <Option type="QString" value="0" name="labeling/shapeSizeType"/>
+          <Option type="QString" value="1" name="labeling/shapeSizeUnits"/>
+          <Option type="QString" value="0" name="labeling/shapeSizeX"/>
+          <Option type="QString" value="0" name="labeling/shapeSizeY"/>
+          <Option type="QString" value="0" name="labeling/shapeTransparency"/>
+          <Option type="QString" value="0" name="labeling/shapeType"/>
+          <Option type="QString" value="255" name="labeling/textColorA"/>
+          <Option type="QString" value="255" name="labeling/textColorB"/>
+          <Option type="QString" value="255" name="labeling/textColorG"/>
+          <Option type="QString" value="255" name="labeling/textColorR"/>
+          <Option type="QString" value="0" name="labeling/textTransp"/>
+          <Option type="QString" value="0" name="labeling/upsidedownLabels"/>
+          <Option type="QString" value="" name="labeling/wrapChar"/>
+          <Option type="QString" value="0" name="labeling/xOffset"/>
+          <Option type="QString" value="0" name="labeling/yOffset"/>
+          <Option type="QString" value="0" name="labeling/zIndex"/>
           <Option type="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -10369,48 +10371,48 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory penAlpha="255" width="15" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" minimumSize="0" enabled="0" maxScaleDenominator="1e+08" diagramOrientation="Up" opacity="1" scaleBasedVisibility="0" spacingUnit="MM" minScaleDenominator="100000" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" lineSizeType="MM" penWidth="0" backgroundAlpha="255" scaleDependency="Area" spacing="0" direction="1" barWidth="5" sizeType="MM" height="15" penColor="#000000" showAxis="0">
-          <fontProperties bold="0" style="" italic="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0"/>
-          <attribute label="" colorOpacity="1" field="" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory height="15" scaleDependency="Area" width="15" lineSizeScale="3x:0,0,0,0,0,0" spacingUnit="MM" lineSizeType="MM" penColor="#000000" spacing="0" labelPlacementMethod="XHeight" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" backgroundAlpha="255" maxScaleDenominator="1e+08" barWidth="5" penWidth="0" minimumSize="0" penAlpha="255" minScaleDenominator="100000" sizeType="MM" backgroundColor="#ffffff" enabled="0" opacity="1" direction="1" scaleBasedVisibility="0" showAxis="0" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270">
+          <fontProperties style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0" strikethrough="0" italic="0" underline="0" bold="0"/>
+          <attribute color="#000000" field="" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="35,35,35,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0.26" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -10441,9 +10443,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -10451,28 +10453,28 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="10" showAll="1" placement="0" zIndex="0" dist="0" priority="0" obstacle="0">
+      <DiagramLayerSettings priority="0" linePlacementFlags="10" obstacle="0" dist="0" zIndex="0" placement="0" showAll="1">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field configurationFlags="None" name="id">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -10481,8 +10483,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -10491,43 +10493,43 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
-        <alias index="1" name="" field="position"/>
-        <alias index="2" name="" field="type"/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="position" name=""/>
+        <alias index="2" field="type" name=""/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="position"/>
-        <default applyOnUpdate="0" expression="" field="type"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="position" expression=""/>
+        <default applyOnUpdate="0" field="type" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="id" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="position" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="type" constraints="0"/>
+        <constraint exp_strength="0" field="id" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="position" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="type" notnull_strength="0" constraints="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" desc="" field="id"/>
-        <constraint exp="" desc="" field="position"/>
-        <constraint exp="" desc="" field="type"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="position" desc=""/>
+        <constraint exp="" field="type" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="&quot;position&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="&quot;position&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column width="-1" type="field" name="id" hidden="0"/>
+          <column width="-1" type="field" hidden="0" name="id"/>
           <column width="-1" type="actions" hidden="1"/>
-          <column width="-1" type="field" name="position" hidden="0"/>
-          <column width="-1" type="field" name="type" hidden="0"/>
+          <column width="-1" type="field" hidden="0" name="position"/>
+          <column width="-1" type="field" hidden="0" name="type"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -10603,7 +10605,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip>name</mapTip>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" simplifyLocal="1" autoRefreshTime="0" wkbType="Polygon" simplifyDrawingHints="1" type="vector" symbologyReferenceScale="-1" minScale="100000000" legendPlaceholderImage="" refreshOnNotifyEnabled="0" labelsEnabled="0" maxScale="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" refreshOnNotifyMessage="" readOnly="0" geometry="Polygon" autoRefreshEnabled="0" simplifyDrawingTol="1">
+    <maplayer simplifyLocal="1" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1" legendPlaceholderImage="" symbologyReferenceScale="-1" readOnly="0" refreshOnNotifyEnabled="0" minScale="100000000" maxScale="0" type="vector" autoRefreshTime="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="0" styleCategories="AllStyleCategories" geometry="Polygon" autoRefreshEnabled="0" wkbType="Polygon">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
@@ -10678,58 +10680,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" startExpression="" mode="0" limitMode="0" endField="" fixedDuration="0" accumulate="0" durationUnit="min" startField="" endExpression="" enabled="0">
+      <temporal durationField="" fixedDuration="0" accumulate="0" endField="" startField="" enabled="0" startExpression="" endExpression="" durationUnit="min" mode="0" limitMode="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" zscale="1" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" binding="Centroid" type="IndividualFeatures" symbology="Line" extrusion="0" zoffset="0">
+      <elevation extrusionEnabled="0" symbology="Line" type="IndividualFeatures" zscale="1" clamping="Terrain" showMarkerSymbolInSurfacePlots="0" zoffset="0" extrusion="0" respectLayerSymbol="1" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="164,113,88,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="164,113,88,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -10760,36 +10762,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="164,113,88,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="117,81,63,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="164,113,88,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="117,81,63,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="164,113,88,255"/>
@@ -10804,44 +10806,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="164,113,88,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="117,81,63,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="164,113,88,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="diamond" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="117,81,63,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="3" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -10864,38 +10866,38 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" type="singleSymbol" symbollevels="0" referencescale="-1" enableorderby="0">
+      <renderer-v2 enableorderby="0" type="singleSymbol" symbollevels="0" referencescale="-1" forceraster="0">
         <symbols>
-          <symbol is_animated="0" type="fill" name="0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="0,85,0,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0,85,0,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="b_diagonal" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="0,85,0,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0,85,0,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.26" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="b_diagonal" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="0,85,0,255"/>
@@ -10910,9 +10912,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="b_diagonal"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -10923,11 +10925,11 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="no_action" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option value="name" type="QString" name="dualview/previewExpressions"/>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="QString" value="no_action" name="QFieldSync/action"/>
+          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="name" name="dualview/previewExpressions"/>
+          <Option type="QString" value="0" name="embeddedWidgets/count"/>
           <Option type="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -10935,48 +10937,48 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory penAlpha="255" width="15" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" minimumSize="0" enabled="0" maxScaleDenominator="1e+08" diagramOrientation="Up" opacity="1" scaleBasedVisibility="0" spacingUnit="MM" minScaleDenominator="0" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" lineSizeType="MM" penWidth="0" backgroundAlpha="255" scaleDependency="Area" spacing="0" direction="1" barWidth="5" sizeType="MM" height="15" penColor="#000000" showAxis="0">
-          <fontProperties bold="0" style="" italic="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0"/>
-          <attribute label="" colorOpacity="1" field="" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory height="15" scaleDependency="Area" width="15" lineSizeScale="3x:0,0,0,0,0,0" spacingUnit="MM" lineSizeType="MM" penColor="#000000" spacing="0" labelPlacementMethod="XHeight" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" backgroundAlpha="255" maxScaleDenominator="1e+08" barWidth="5" penWidth="0" minimumSize="0" penAlpha="255" minScaleDenominator="0" sizeType="MM" backgroundColor="#ffffff" enabled="0" opacity="1" direction="1" scaleBasedVisibility="0" showAxis="0" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270">
+          <fontProperties style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0" strikethrough="0" italic="0" underline="0" bold="0"/>
+          <attribute color="#000000" field="" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="35,35,35,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0.26" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -11007,9 +11009,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -11017,20 +11019,20 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" showAll="1" placement="1" zIndex="0" dist="0" priority="0" obstacle="0">
+      <DiagramLayerSettings priority="0" linePlacementFlags="18" obstacle="0" dist="0" zIndex="0" placement="1" showAll="1">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field configurationFlags="None" name="name">
@@ -11070,45 +11072,45 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="name"/>
-        <alias index="1" name="" field="group"/>
-        <alias index="2" name="" field="type"/>
-        <alias index="3" name="" field="cone_len"/>
-        <alias index="4" name="" field="fence_len"/>
+        <alias index="0" field="name" name=""/>
+        <alias index="1" field="group" name=""/>
+        <alias index="2" field="type" name=""/>
+        <alias index="3" field="cone_len" name=""/>
+        <alias index="4" field="fence_len" name=""/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="name"/>
-        <default applyOnUpdate="0" expression="" field="group"/>
-        <default applyOnUpdate="0" expression="" field="type"/>
-        <default applyOnUpdate="0" expression="" field="cone_len"/>
-        <default applyOnUpdate="0" expression="" field="fence_len"/>
+        <default applyOnUpdate="0" field="name" expression=""/>
+        <default applyOnUpdate="0" field="group" expression=""/>
+        <default applyOnUpdate="0" field="type" expression=""/>
+        <default applyOnUpdate="0" field="cone_len" expression=""/>
+        <default applyOnUpdate="0" field="fence_len" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="name" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="group" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="type" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="cone_len" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="fence_len" constraints="0"/>
+        <constraint exp_strength="0" field="name" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="group" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="type" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="cone_len" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="fence_len" notnull_strength="0" constraints="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" desc="" field="name"/>
-        <constraint exp="" desc="" field="group"/>
-        <constraint exp="" desc="" field="type"/>
-        <constraint exp="" desc="" field="cone_len"/>
-        <constraint exp="" desc="" field="fence_len"/>
+        <constraint exp="" field="name" desc=""/>
+        <constraint exp="" field="group" desc=""/>
+        <constraint exp="" field="type" desc=""/>
+        <constraint exp="" field="cone_len" desc=""/>
+        <constraint exp="" field="fence_len" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column width="-1" type="field" name="name" hidden="0"/>
-          <column width="-1" type="field" name="group" hidden="0"/>
+          <column width="-1" type="field" hidden="0" name="name"/>
+          <column width="-1" type="field" hidden="0" name="group"/>
           <column width="-1" type="actions" hidden="1"/>
-          <column width="-1" type="field" name="type" hidden="0"/>
-          <column width="-1" type="field" name="cone_len" hidden="0"/>
-          <column width="-1" type="field" name="fence_len" hidden="0"/>
+          <column width="-1" type="field" hidden="0" name="type"/>
+          <column width="-1" type="field" hidden="0" name="cone_len"/>
+          <column width="-1" type="field" hidden="0" name="fence_len"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -11140,12 +11142,12 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="group" editable="1"/>
-        <field name="name" editable="1"/>
+        <field editable="1" name="group"/>
+        <field editable="1" name="name"/>
       </editable>
       <labelOnTop>
-        <field name="group" labelOnTop="0"/>
-        <field name="name" labelOnTop="0"/>
+        <field labelOnTop="0" name="group"/>
+        <field labelOnTop="0" name="name"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -11153,7 +11155,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" simplifyLocal="1" autoRefreshTime="0" wkbType="MultiLineString" simplifyDrawingHints="1" type="vector" symbologyReferenceScale="-1" minScale="100000000" legendPlaceholderImage="" refreshOnNotifyEnabled="0" labelsEnabled="1" maxScale="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" refreshOnNotifyMessage="" readOnly="0" geometry="Line" autoRefreshEnabled="0" simplifyDrawingTol="1">
+    <maplayer simplifyLocal="1" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1" legendPlaceholderImage="" symbologyReferenceScale="-1" readOnly="0" refreshOnNotifyEnabled="0" minScale="100000000" maxScale="0" type="vector" autoRefreshTime="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="1" styleCategories="AllStyleCategories" geometry="Line" autoRefreshEnabled="0" wkbType="MultiLineString">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
@@ -11218,7 +11220,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxy="0" minz="0" dimensions="2" maxx="0" maxz="0" miny="0" minx="0" crs=""/>
+          <spatial maxz="0" minx="0" maxx="0" minz="0" crs="" miny="0" maxy="0" dimensions="2"/>
           <temporal>
             <period>
               <start></start>
@@ -11232,26 +11234,26 @@ def my_form_open(dialog, layer, feature):
       <layerDependencies/>
       <dataDependencies/>
       <expressionfields>
-        <field typeName="double precision" subType="0" type="6" name="fence_len" precision="0" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" length="-1" comment=""/>
-        <field typeName="double precision" subType="0" type="6" name="fence_len" precision="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" length="-1" comment=""/>
-        <field typeName="double precision" subType="0" type="6" name="cone_len" precision="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" length="-1" comment=""/>
+        <field precision="0" comment="" type="6" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" length="-1" subType="0" typeName="double precision" name="fence_len"/>
+        <field precision="0" comment="" type="6" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" length="-1" subType="0" typeName="double precision" name="fence_len"/>
+        <field precision="0" comment="" type="6" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" length="-1" subType="0" typeName="double precision" name="cone_len"/>
       </expressionfields>
       <map-layer-style-manager current="Fencing">
         <map-layer-style name="Fencing"/>
         <map-layer-style name="Simple">
-          <qgis minScale="1e+08" simplifyMaxScale="1" version="3.8.3-Zanzibar" labelsEnabled="1" simplifyDrawingTol="1" maxScale="0" hasScaleBasedVisibilityFlag="0" simplifyAlgorithm="0" simplifyLocal="1" styleCategories="AllStyleCategories" readOnly="0" simplifyDrawingHints="1">
+          <qgis minScale="1e+08" labelsEnabled="1" hasScaleBasedVisibilityFlag="0" maxScale="0" readOnly="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" simplifyMaxScale="1" version="3.8.3-Zanzibar" simplifyLocal="1" simplifyDrawingHints="1" simplifyDrawingTol="1">
             <flags>
               <Identifiable>1</Identifiable>
               <Removable>1</Removable>
               <Searchable>1</Searchable>
             </flags>
-            <renderer-v2 forceraster="0" type="RuleRenderer" symbollevels="1" enableorderby="0">
+            <renderer-v2 enableorderby="0" type="RuleRenderer" symbollevels="1" forceraster="0">
               <rules key="{1747eeb3-5193-4fd1-bb47-6984c7977e45}">
-                <rule filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" symbol="0" label="Visible" key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}"/>
+                <rule symbol="0" label="Visible" key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL"/>
               </rules>
               <symbols>
-                <symbol type="line" name="0" clip_to_extent="1" alpha="1" force_rhr="0">
-                  <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+                <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" name="0">
+                  <layer locked="0" class="SimpleLine" enabled="1" pass="0">
                     <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"/>
@@ -11270,9 +11272,9 @@ def my_form_open(dialog, layer, feature):
                     <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
@@ -11281,64 +11283,64 @@ def my_form_open(dialog, layer, feature):
             </renderer-v2>
             <labeling type="rule-based">
               <rules key="{7b0a59ec-9387-4d8e-badd-0d99ebc42174}">
-                <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;" key="{4961744d-6387-45d0-90bf-01e48d575e6e}">
+                <rule key="{4961744d-6387-45d0-90bf-01e48d575e6e}" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;">
                   <settings>
-                    <text-style fontFamily="Myriad Pro" fontWeight="50" previewBkgrdColor="#ffffff" fontCapitals="0" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="0.8" fieldName="comment" useSubstitutions="0" fontStrikeout="0" blendMode="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" fontItalic="0" multilineHeight="1" fontSize="11" namedStyle="Regular" isExpression="0" fontSizeUnit="Point">
-                      <text-buffer bufferNoFill="1" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                      <background shapeRadiiY="1" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="1" shapeFillColor="255,255,255,255" shapeDraw="1" shapeBorderWidth="0.6" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="1" shapeType="0" shapeJoinStyle="128" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="255,255,0,255" shapeOffsetX="0" shapeOpacity="0.6" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeRadiiX="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0"/>
-                      <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.7" shadowOffsetGlobal="1" shadowScale="100" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+                    <text-style textOpacity="0.8" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" namedStyle="Regular" fontUnderline="0" fieldName="comment" multilineHeight="1" fontCapitals="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="#ffffff" fontWordSpacing="0" useSubstitutions="0" fontWeight="50" fontStrikeout="0" fontItalic="0" fontSize="11" textColor="0,0,0,255" fontFamily="Myriad Pro" isExpression="0">
+                      <text-buffer bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                      <background shapeRadiiY="1" shapeOffsetY="0" shapeSVGFile="" shapeBorderColor="255,255,0,255" shapeRotation="0" shapeRotationType="0" shapeSizeX="1" shapeDraw="1" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeJoinStyle="128" shapeOffsetX="0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0.6" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="0.6" shapeSizeY="1" shapeRadiiX="1"/>
+                      <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusUnit="MM" shadowUnder="0" shadowScale="100" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
                       <substitutions/>
                     </text-style>
-                    <text-format useMaxLineLengthForAutoWrap="1" leftDirectionSymbol="&lt;" wrapChar="" multilineAlign="4294967295" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" decimals="3" rightDirectionSymbol=">" formatNumbers="0"/>
-                    <placement rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="4" priority="5" centroidInside="0" xOffset="0" offsetType="0" yOffset="0" dist="5" distUnits="MM" offsetUnits="MM" quadOffset="4" maxCurvedCharAngleIn="25" placementFlags="2" maxCurvedCharAngleOut="-25" centroidWhole="0" preserveRotation="1" geometryGenerator="" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" distMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" repeatDistance="0" repeatDistanceUnits="MM" fitInPolygonOnly="0"/>
-                    <rendering fontMaxPixelSize="10000" drawLabels="1" mergeLines="1" zIndex="0" upsidedownLabels="0" displayAll="1" obstacleFactor="1" scaleVisibility="0" limitNumLabels="0" obstacleType="0" fontLimitPixelSize="0" maxNumLabels="2000" minFeatureSize="0" fontMinPixelSize="3" labelPerPart="0" obstacle="1" scaleMax="0" scaleMin="0"/>
+                    <text-format wrapChar="" plussign="0" rightDirectionSymbol=">" leftDirectionSymbol="&lt;" formatNumbers="0" decimals="3" multilineAlign="4294967295" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" reverseDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0"/>
+                    <placement quadOffset="4" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" priority="5" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" dist="5" offsetUnits="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" preserveRotation="1" yOffset="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" geometryGenerator="" centroidWhole="0" xOffset="0" placement="4" centroidInside="0" offsetType="0" placementFlags="2" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" maxCurvedCharAngleIn="25" maxCurvedCharAngleOut="-25" distUnits="MM"/>
+                    <rendering limitNumLabels="0" obstacleType="0" obstacle="1" scaleMax="0" maxNumLabels="2000" labelPerPart="0" scaleMin="0" upsidedownLabels="0" zIndex="0" fontLimitPixelSize="0" displayAll="1" minFeatureSize="0" fontMaxPixelSize="10000" scaleVisibility="0" fontMinPixelSize="3" drawLabels="1" mergeLines="1" obstacleFactor="1"/>
                     <dd_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option type="Map" name="properties">
                           <Option type="Map" name="PositionX">
-                            <Option value="true" type="bool" name="active"/>
-                            <Option value="auxiliary_storage_labeling_positionx" type="QString" name="field"/>
-                            <Option value="2" type="int" name="type"/>
+                            <Option type="bool" value="true" name="active"/>
+                            <Option type="QString" value="auxiliary_storage_labeling_positionx" name="field"/>
+                            <Option type="int" value="2" name="type"/>
                           </Option>
                           <Option type="Map" name="PositionY">
-                            <Option value="true" type="bool" name="active"/>
-                            <Option value="auxiliary_storage_labeling_positiony" type="QString" name="field"/>
-                            <Option value="2" type="int" name="type"/>
+                            <Option type="bool" value="true" name="active"/>
+                            <Option type="QString" value="auxiliary_storage_labeling_positiony" name="field"/>
+                            <Option type="int" value="2" name="type"/>
                           </Option>
                         </Option>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </dd_properties>
                   </settings>
                 </rule>
-                <rule filter="regexp_match(&quot;type&quot;, '^(fenc|cone)')" key="{b0a0c7d3-1b58-4c75-96e0-99907a348e50}">
+                <rule key="{b0a0c7d3-1b58-4c75-96e0-99907a348e50}" filter="regexp_match(&quot;type&quot;, '^(fenc|cone)')">
                   <settings>
-                    <text-style fontFamily="Myriad Pro" fontWeight="63" previewBkgrdColor="#ffffff" fontCapitals="0" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="1" fieldName="round( $length, 1) || 'm'" useSubstitutions="0" fontStrikeout="0" blendMode="0" fontUnderline="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" fontItalic="0" multilineHeight="1" fontSize="12" namedStyle="Semibold" isExpression="1" fontSizeUnit="Point">
-                      <text-buffer bufferNoFill="1" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferDraw="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                      <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeBorderWidth="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiUnit="MM" shapeRadiiX="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0"/>
-                      <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.7" shadowOffsetGlobal="1" shadowScale="100" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+                    <text-style textOpacity="1" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" namedStyle="Semibold" fontUnderline="0" fieldName="round( $length, 1) || 'm'" multilineHeight="1" fontCapitals="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="#ffffff" fontWordSpacing="0" useSubstitutions="0" fontWeight="63" fontStrikeout="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" fontFamily="Myriad Pro" isExpression="1">
+                      <text-buffer bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="1" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                      <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeBorderColor="128,128,128,255" shapeRotation="0" shapeRotationType="0" shapeSizeX="0" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeJoinStyle="64" shapeOffsetX="0" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0"/>
+                      <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetAngle="135" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowRadiusUnit="MM" shadowUnder="0" shadowScale="100" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
                       <substitutions/>
                     </text-style>
-                    <text-format useMaxLineLengthForAutoWrap="1" leftDirectionSymbol="&lt;" wrapChar="" multilineAlign="4294967295" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" decimals="3" rightDirectionSymbol=">" formatNumbers="0"/>
-                    <placement rotationAngle="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="2" priority="5" centroidInside="0" xOffset="0" offsetType="0" yOffset="0" dist="1" distUnits="MM" offsetUnits="MM" quadOffset="4" maxCurvedCharAngleIn="25" placementFlags="15" maxCurvedCharAngleOut="-25" centroidWhole="0" preserveRotation="1" geometryGenerator="" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" distMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" repeatDistance="0" repeatDistanceUnits="MM" fitInPolygonOnly="0"/>
-                    <rendering fontMaxPixelSize="10000" drawLabels="1" mergeLines="0" zIndex="0" upsidedownLabels="0" displayAll="0" obstacleFactor="1" scaleVisibility="0" limitNumLabels="0" obstacleType="0" fontLimitPixelSize="0" maxNumLabels="2000" minFeatureSize="0" fontMinPixelSize="3" labelPerPart="0" obstacle="1" scaleMax="0" scaleMin="0"/>
+                    <text-format wrapChar="" plussign="0" rightDirectionSymbol=">" leftDirectionSymbol="&lt;" formatNumbers="0" decimals="3" multilineAlign="4294967295" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" reverseDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0"/>
+                    <placement quadOffset="4" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" priority="5" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" dist="1" offsetUnits="MM" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" preserveRotation="1" yOffset="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" geometryGenerator="" centroidWhole="0" xOffset="0" placement="2" centroidInside="0" offsetType="0" placementFlags="15" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistance="0" maxCurvedCharAngleIn="25" maxCurvedCharAngleOut="-25" distUnits="MM"/>
+                    <rendering limitNumLabels="0" obstacleType="0" obstacle="1" scaleMax="0" maxNumLabels="2000" labelPerPart="0" scaleMin="0" upsidedownLabels="0" zIndex="0" fontLimitPixelSize="0" displayAll="0" minFeatureSize="0" fontMaxPixelSize="10000" scaleVisibility="0" fontMinPixelSize="3" drawLabels="1" mergeLines="0" obstacleFactor="1"/>
                     <dd_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option type="Map" name="properties">
                           <Option type="Map" name="PositionX">
-                            <Option value="true" type="bool" name="active"/>
-                            <Option value="auxiliary_storage_labeling_positionx" type="QString" name="field"/>
-                            <Option value="2" type="int" name="type"/>
+                            <Option type="bool" value="true" name="active"/>
+                            <Option type="QString" value="auxiliary_storage_labeling_positionx" name="field"/>
+                            <Option type="int" value="2" name="type"/>
                           </Option>
                           <Option type="Map" name="PositionY">
-                            <Option value="true" type="bool" name="active"/>
-                            <Option value="auxiliary_storage_labeling_positiony" type="QString" name="field"/>
-                            <Option value="2" type="int" name="type"/>
+                            <Option type="bool" value="true" name="active"/>
+                            <Option type="QString" value="auxiliary_storage_labeling_positiony" name="field"/>
+                            <Option type="int" value="2" name="type"/>
                           </Option>
                         </Option>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </dd_properties>
                   </settings>
@@ -11346,30 +11348,30 @@ def my_form_open(dialog, layer, feature):
               </rules>
             </labeling>
             <customproperties>
-              <property value="id" key="dualview/previewExpressions"/>
-              <property value="0" key="embeddedWidgets/count"/>
+              <property key="dualview/previewExpressions" value="id"/>
+              <property key="embeddedWidgets/count" value="0"/>
               <property key="variableNames"/>
               <property key="variableValues"/>
             </customproperties>
             <blendMode>0</blendMode>
             <featureBlendMode>0</featureBlendMode>
             <layerOpacity>1</layerOpacity>
-            <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-              <DiagramCategory penAlpha="255" width="15" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" minimumSize="0" enabled="0" maxScaleDenominator="1e+08" diagramOrientation="Up" opacity="1" scaleBasedVisibility="0" minScaleDenominator="0" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" labelPlacementMethod="XHeight" lineSizeType="MM" penWidth="0" backgroundAlpha="255" scaleDependency="Area" barWidth="5" sizeType="MM" height="15" penColor="#000000">
+            <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+              <DiagramCategory height="15" scaleDependency="Area" width="15" lineSizeScale="3x:0,0,0,0,0,0" lineSizeType="MM" penColor="#000000" labelPlacementMethod="XHeight" diagramOrientation="Up" barWidth="5" maxScaleDenominator="1e+08" backgroundAlpha="255" minimumSize="0" penWidth="0" penAlpha="255" minScaleDenominator="0" sizeType="MM" backgroundColor="#ffffff" enabled="0" opacity="1" scaleBasedVisibility="0" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270">
                 <fontProperties style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
-                <attribute label="" field="" color="#000000"/>
+                <attribute color="#000000" field="" label=""/>
               </DiagramCategory>
             </SingleCategoryDiagramRenderer>
-            <DiagramLayerSettings linePlacementFlags="18" showAll="1" placement="2" zIndex="0" dist="0" obstacle="0" priority="0">
+            <DiagramLayerSettings priority="0" linePlacementFlags="18" obstacle="0" dist="0" zIndex="0" showAll="1" placement="2">
               <properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </properties>
             </DiagramLayerSettings>
-            <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+            <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
               <activeChecks/>
               <checkConfiguration/>
             </geometryOptions>
@@ -11453,17 +11455,17 @@ def my_form_open(dialog, layer, feature):
               </field>
             </fieldConfiguration>
             <aliases>
-              <alias index="0" name="" field="id"/>
-              <alias index="1" name="" field="group"/>
-              <alias index="2" name="" field="comment"/>
-              <alias index="3" name="" field="moveable"/>
-              <alias index="4" name="" field="type"/>
-              <alias index="5" name="" field="name"/>
-              <alias index="6" name="" field="hidden"/>
-              <alias index="7" name="" field="auxiliary_storage_labeling_positiony"/>
-              <alias index="8" name="" field="auxiliary_storage_labeling_positionx"/>
-              <alias index="9" name="" field="fence_len"/>
-              <alias index="10" name="" field="cone_len"/>
+              <alias index="0" field="id" name=""/>
+              <alias index="1" field="group" name=""/>
+              <alias index="2" field="comment" name=""/>
+              <alias index="3" field="moveable" name=""/>
+              <alias index="4" field="type" name=""/>
+              <alias index="5" field="name" name=""/>
+              <alias index="6" field="hidden" name=""/>
+              <alias index="7" field="auxiliary_storage_labeling_positiony" name=""/>
+              <alias index="8" field="auxiliary_storage_labeling_positionx" name=""/>
+              <alias index="9" field="fence_len" name=""/>
+              <alias index="10" field="cone_len" name=""/>
             </aliases>
             <excludeAttributesWMS/>
             <excludeAttributesWFS/>
@@ -11481,53 +11483,53 @@ def my_form_open(dialog, layer, feature):
               <default applyOnUpdate="0" expression="" field="cone_len"/>
             </defaults>
             <constraints>
-              <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="id" constraints="0"/>
-              <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="group" constraints="0"/>
-              <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="comment" constraints="0"/>
-              <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="moveable" constraints="0"/>
-              <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="type" constraints="0"/>
-              <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="name" constraints="0"/>
-              <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="hidden" constraints="0"/>
-              <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="auxiliary_storage_labeling_positiony" constraints="0"/>
-              <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="auxiliary_storage_labeling_positionx" constraints="0"/>
-              <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="fence_len" constraints="0"/>
-              <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="cone_len" constraints="0"/>
+              <constraint exp_strength="0" notnull_strength="0" field="id" constraints="0" unique_strength="0"/>
+              <constraint exp_strength="0" notnull_strength="0" field="group" constraints="0" unique_strength="0"/>
+              <constraint exp_strength="0" notnull_strength="0" field="comment" constraints="0" unique_strength="0"/>
+              <constraint exp_strength="0" notnull_strength="0" field="moveable" constraints="0" unique_strength="0"/>
+              <constraint exp_strength="0" notnull_strength="0" field="type" constraints="0" unique_strength="0"/>
+              <constraint exp_strength="0" notnull_strength="0" field="name" constraints="0" unique_strength="0"/>
+              <constraint exp_strength="0" notnull_strength="0" field="hidden" constraints="0" unique_strength="0"/>
+              <constraint exp_strength="0" notnull_strength="0" field="auxiliary_storage_labeling_positiony" constraints="0" unique_strength="0"/>
+              <constraint exp_strength="0" notnull_strength="0" field="auxiliary_storage_labeling_positionx" constraints="0" unique_strength="0"/>
+              <constraint exp_strength="0" notnull_strength="0" field="fence_len" constraints="0" unique_strength="0"/>
+              <constraint exp_strength="0" notnull_strength="0" field="cone_len" constraints="0" unique_strength="0"/>
             </constraints>
             <constraintExpressions>
-              <constraint exp="" desc="" field="id"/>
-              <constraint exp="" desc="" field="group"/>
-              <constraint exp="" desc="" field="comment"/>
-              <constraint exp="" desc="" field="moveable"/>
-              <constraint exp="" desc="" field="type"/>
-              <constraint exp="" desc="" field="name"/>
-              <constraint exp="" desc="" field="hidden"/>
-              <constraint exp="" desc="" field="auxiliary_storage_labeling_positiony"/>
-              <constraint exp="" desc="" field="auxiliary_storage_labeling_positionx"/>
-              <constraint exp="" desc="" field="fence_len"/>
-              <constraint exp="" desc="" field="cone_len"/>
+              <constraint exp="" field="id" desc=""/>
+              <constraint exp="" field="group" desc=""/>
+              <constraint exp="" field="comment" desc=""/>
+              <constraint exp="" field="moveable" desc=""/>
+              <constraint exp="" field="type" desc=""/>
+              <constraint exp="" field="name" desc=""/>
+              <constraint exp="" field="hidden" desc=""/>
+              <constraint exp="" field="auxiliary_storage_labeling_positiony" desc=""/>
+              <constraint exp="" field="auxiliary_storage_labeling_positionx" desc=""/>
+              <constraint exp="" field="fence_len" desc=""/>
+              <constraint exp="" field="cone_len" desc=""/>
             </constraintExpressions>
             <expressionfields>
-              <field typeName="double precision" subType="0" type="6" name="fence_len" precision="0" length="-1" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" comment=""/>
-              <field typeName="double precision" subType="0" type="6" name="fence_len" precision="0" length="-1" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" comment=""/>
-              <field typeName="double precision" subType="0" type="6" name="cone_len" precision="0" length="-1" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" comment=""/>
+              <field precision="0" type="6" comment="" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" length="-1" subType="0" typeName="double precision" name="fence_len"/>
+              <field precision="0" type="6" comment="" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" length="-1" subType="0" typeName="double precision" name="fence_len"/>
+              <field precision="0" type="6" comment="" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" length="-1" subType="0" typeName="double precision" name="cone_len"/>
             </expressionfields>
             <attributeactions>
-              <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+              <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
             </attributeactions>
             <attributetableconfig sortOrder="0" sortExpression="&quot;group&quot;" actionWidgetStyle="dropDown">
               <columns>
-                <column width="-1" type="field" name="id" hidden="0"/>
-                <column width="-1" type="field" name="group" hidden="0"/>
+                <column width="-1" type="field" hidden="0" name="id"/>
+                <column width="-1" type="field" hidden="0" name="group"/>
                 <column width="-1" type="actions" hidden="1"/>
-                <column width="223" type="field" name="comment" hidden="0"/>
-                <column width="-1" type="field" name="moveable" hidden="0"/>
-                <column width="-1" type="field" name="type" hidden="0"/>
-                <column width="414" type="field" name="name" hidden="0"/>
-                <column width="-1" type="field" name="hidden" hidden="0"/>
-                <column width="-1" type="field" name="fence_len" hidden="0"/>
-                <column width="-1" type="field" name="cone_len" hidden="0"/>
-                <column width="-1" type="field" name="auxiliary_storage_labeling_positiony" hidden="1"/>
-                <column width="-1" type="field" name="auxiliary_storage_labeling_positionx" hidden="1"/>
+                <column width="223" type="field" hidden="0" name="comment"/>
+                <column width="-1" type="field" hidden="0" name="moveable"/>
+                <column width="-1" type="field" hidden="0" name="type"/>
+                <column width="414" type="field" hidden="0" name="name"/>
+                <column width="-1" type="field" hidden="0" name="hidden"/>
+                <column width="-1" type="field" hidden="0" name="fence_len"/>
+                <column width="-1" type="field" hidden="0" name="cone_len"/>
+                <column width="-1" type="field" hidden="1" name="auxiliary_storage_labeling_positiony"/>
+                <column width="-1" type="field" hidden="1" name="auxiliary_storage_labeling_positionx"/>
               </columns>
             </attributetableconfig>
             <conditionalstyles>
@@ -11558,32 +11560,32 @@ def my_form_open(dialog, layer, feature):
             <featformsuppress>0</featformsuppress>
             <editorlayout>generatedlayout</editorlayout>
             <editable>
-              <field name="auxiliary_storage_labeling_positionx" editable="0"/>
-              <field name="auxiliary_storage_labeling_positiony" editable="0"/>
-              <field name="comment" editable="1"/>
-              <field name="cone_len" editable="0"/>
-              <field name="fence_len" editable="0"/>
-              <field name="group" editable="1"/>
-              <field name="hidden" editable="1"/>
-              <field name="id" editable="1"/>
-              <field name="length" editable="0"/>
-              <field name="moveable" editable="1"/>
-              <field name="name" editable="1"/>
-              <field name="type" editable="1"/>
+              <field editable="0" name="auxiliary_storage_labeling_positionx"/>
+              <field editable="0" name="auxiliary_storage_labeling_positiony"/>
+              <field editable="1" name="comment"/>
+              <field editable="0" name="cone_len"/>
+              <field editable="0" name="fence_len"/>
+              <field editable="1" name="group"/>
+              <field editable="1" name="hidden"/>
+              <field editable="1" name="id"/>
+              <field editable="0" name="length"/>
+              <field editable="1" name="moveable"/>
+              <field editable="1" name="name"/>
+              <field editable="1" name="type"/>
             </editable>
             <labelOnTop>
-              <field name="auxiliary_storage_labeling_positionx" labelOnTop="0"/>
-              <field name="auxiliary_storage_labeling_positiony" labelOnTop="0"/>
-              <field name="comment" labelOnTop="0"/>
-              <field name="cone_len" labelOnTop="0"/>
-              <field name="fence_len" labelOnTop="0"/>
-              <field name="group" labelOnTop="0"/>
-              <field name="hidden" labelOnTop="0"/>
-              <field name="id" labelOnTop="0"/>
-              <field name="length" labelOnTop="0"/>
-              <field name="moveable" labelOnTop="0"/>
-              <field name="name" labelOnTop="0"/>
-              <field name="type" labelOnTop="0"/>
+              <field labelOnTop="0" name="auxiliary_storage_labeling_positionx"/>
+              <field labelOnTop="0" name="auxiliary_storage_labeling_positiony"/>
+              <field labelOnTop="0" name="comment"/>
+              <field labelOnTop="0" name="cone_len"/>
+              <field labelOnTop="0" name="fence_len"/>
+              <field labelOnTop="0" name="group"/>
+              <field labelOnTop="0" name="hidden"/>
+              <field labelOnTop="0" name="id"/>
+              <field labelOnTop="0" name="length"/>
+              <field labelOnTop="0" name="moveable"/>
+              <field labelOnTop="0" name="name"/>
+              <field labelOnTop="0" name="type"/>
             </labelOnTop>
             <widgets/>
             <previewExpression>id</previewExpression>
@@ -11600,58 +11602,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" startExpression="" mode="0" limitMode="0" endField="" fixedDuration="0" accumulate="0" durationUnit="min" startField="" endExpression="" enabled="0">
+      <temporal durationField="" fixedDuration="0" accumulate="0" endField="" startField="" enabled="0" startExpression="" endExpression="" durationUnit="min" mode="0" limitMode="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" zscale="1" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" binding="Centroid" type="IndividualFeatures" symbology="Line" extrusion="0" zoffset="0">
+      <elevation extrusionEnabled="0" symbology="Line" type="IndividualFeatures" zscale="1" clamping="Terrain" showMarkerSymbolInSurfacePlots="0" zoffset="0" extrusion="0" respectLayerSymbol="1" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="133,182,111,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="133,182,111,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -11682,36 +11684,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="133,182,111,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="95,130,79,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="133,182,111,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="95,130,79,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="133,182,111,255"/>
@@ -11726,44 +11728,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="133,182,111,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="95,130,79,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="133,182,111,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="diamond" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="95,130,79,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="3" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -11786,64 +11788,64 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" type="RuleRenderer" symbollevels="1" referencescale="-1" enableorderby="0">
+      <renderer-v2 enableorderby="0" type="RuleRenderer" symbollevels="1" referencescale="-1" forceraster="0">
         <rules key="{1747eeb3-5193-4fd1-bb47-6984c7977e45}">
-          <rule filter="regexp_match(attribute( @atlas_feature , 'type' ), '^(cone|fenc|marshal)')" label="Show in fencing maps" key="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}">
-            <rule filter="regexp_match(&quot;type&quot;, '^cone')" symbol="0" label="Cones" key="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
-            <rule filter="regexp_match(&quot;type&quot;, '^fenc') AND &quot;moveable&quot; IS '1'" symbol="1" label="Moveable fences" key="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
-            <rule filter="regexp_match(&quot;type&quot;, '^fenc') AND NOT &quot;moveable&quot; IS '1'" symbol="2" label="Fixed fences" key="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
-            <rule filter="regexp_match(&quot;type&quot;, '^constr')" symbol="3" label="Construction" checkstate="0" key="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
+          <rule label="Show in fencing maps" key="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" filter="regexp_match(attribute( @atlas_feature , 'type' ), '^(cone|fenc|marshal)')">
+            <rule symbol="0" label="Cones" key="{55e15f58-d121-44dd-9fec-2e77eb26097f}" filter="regexp_match(&quot;type&quot;, '^cone')"/>
+            <rule symbol="1" label="Moveable fences" key="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}" filter="regexp_match(&quot;type&quot;, '^fenc') AND &quot;moveable&quot; IS '1'"/>
+            <rule symbol="2" label="Fixed fences" key="{070da3c0-926e-4be7-b593-17a3235a88fa}" filter="regexp_match(&quot;type&quot;, '^fenc') AND NOT &quot;moveable&quot; IS '1'"/>
+            <rule symbol="3" label="Construction" key="{7be11354-6d79-48d0-a650-aea5f58c1846}" filter="regexp_match(&quot;type&quot;, '^constr')" checkstate="0"/>
           </rule>
-          <rule filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" symbol="4" label="Is Visible" checkstate="0" key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}"/>
+          <rule symbol="4" label="Is Visible" key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" checkstate="0"/>
           <rule symbol="5" key="{29865286-9e35-459b-929c-beb87e7538de}"/>
         </rules>
         <symbols>
-          <symbol is_animated="0" type="line" name="0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="round" type="QString" name="capstyle"/>
-                <Option value="1;4" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="Point" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="round" type="QString" name="joinstyle"/>
-                <Option value="255,255,0,255" type="QString" name="line_color"/>
-                <Option value="dot" type="QString" name="line_style"/>
-                <Option value="1" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="1" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="round" name="capstyle"/>
+                <Option type="QString" value="1;4" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="Point" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="round" name="joinstyle"/>
+                <Option type="QString" value="255,255,0,255" name="line_color"/>
+                <Option type="QString" value="dot" name="line_style"/>
+                <Option type="QString" value="1" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="1" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="round"/>
@@ -11874,56 +11876,56 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" type="line" name="1" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="round" type="QString" name="capstyle"/>
-                <Option value="4;3" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="round" type="QString" name="joinstyle"/>
-                <Option value="255,255,0,255" type="QString" name="line_color"/>
-                <Option value="dash" type="QString" name="line_style"/>
-                <Option value="1" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="round" name="capstyle"/>
+                <Option type="QString" value="4;3" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="round" name="joinstyle"/>
+                <Option type="QString" value="255,255,0,255" name="line_color"/>
+                <Option type="QString" value="dash" name="line_style"/>
+                <Option type="QString" value="1" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="round"/>
@@ -11954,56 +11956,56 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" type="line" name="2" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="2">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="255,255,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.8" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="255,255,0,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.8" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -12034,56 +12036,56 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if( &#xa;&#x9;regexp_match(attribute(@atlas_feature, 'type'), '(cone|fenc)'),&#xa;&#x9;if(&#xa;&#x9;&#x9;attribute( @atlas_feature , 'group' ) != &quot;group&quot;,&#xa;&#x9;&#x9;'#64ffff00', &#xa;&#x9;&#x9;'#ffffff00'), &#xa;&#x9;'#64ffff00')" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" type="line" name="3" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="3">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0,255,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.8" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0,255,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.8" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -12114,56 +12116,56 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if( attribute( @atlas_feature , 'group' ) != &quot;group&quot;, '#640000ff', '#ff0000ff' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if( attribute( @atlas_feature , 'group' ) != &quot;group&quot;, '#640000ff', '#ff0000ff' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" type="line" name="4" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="4">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="255,255,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.26" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="255,255,0,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.26" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -12194,50 +12196,50 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" type="line" name="5" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="5">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="213,180,60,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.26" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="213,180,60,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.26" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -12268,9 +12270,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -12279,34 +12281,34 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="rule-based">
         <rules key="{75ef682c-4a85-4fe1-962a-6082490a3c19}">
-          <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;" key="{05a5f0dd-6b57-4866-8227-d1dd0f4dfdf5}">
+          <rule key="{05a5f0dd-6b57-4866-8227-d1dd0f4dfdf5}" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;">
             <settings calloutType="simple">
-              <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="50" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="0.80000000000000004" fieldName="comment" useSubstitutions="0" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="11" namedStyle="Regular" forcedItalic="0" isExpression="0" fontSizeUnit="Point" allowHtml="0" legendString="Aa">
+              <text-style textOpacity="0.80000000000000004" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="Regular" fontUnderline="0" fieldName="comment" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" useSubstitutions="0" fontWeight="50" fontStrikeout="0" fontItalic="0" fontSize="11" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" isExpression="0" legendString="Aa" textOrientation="horizontal">
                 <families/>
-                <text-buffer bufferNoFill="1" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="0"/>
-                <background shapeRadiiY="1" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="1" shapeFillColor="255,255,255,255" shapeDraw="1" shapeBorderWidth="0.59999999999999998" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="1" shapeType="0" shapeJoinStyle="128" shapeOffsetUnit="MM" shapeBorderColor="255,255,0,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="0.59999999999999998" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="1" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-                  <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+                <text-buffer bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+                <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskType="0"/>
+                <background shapeRadiiY="1" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="255,255,0,255" shapeRotationType="0" shapeSizeX="1" shapeDraw="1" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="128" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0.59999999999999998" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="0.59999999999999998" shapeSizeY="1" shapeRadiiX="1">
+                  <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="255,255,255,255" type="QString" name="color"/>
-                        <Option value="round" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="255,255,0,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0.6" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="255,255,255,255" name="color"/>
+                        <Option type="QString" value="round" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="255,255,0,255" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0.6" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="255,255,255,255"/>
@@ -12321,110 +12323,110 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option type="Map" name="properties">
                       <Option type="Map" name="PositionX">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="auxiliary_storage_labeling_positionx" type="QString" name="field"/>
-                        <Option value="2" type="int" name="type"/>
+                        <Option type="bool" value="true" name="active"/>
+                        <Option type="QString" value="auxiliary_storage_labeling_positionx" name="field"/>
+                        <Option type="int" value="2" name="type"/>
                       </Option>
                       <Option type="Map" name="PositionY">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="auxiliary_storage_labeling_positiony" type="QString" name="field"/>
-                        <Option value="2" type="int" name="type"/>
+                        <Option type="bool" value="true" name="active"/>
+                        <Option type="QString" value="auxiliary_storage_labeling_positiony" name="field"/>
+                        <Option type="int" value="2" name="type"/>
                       </Option>
                     </Option>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format useMaxLineLengthForAutoWrap="1" leftDirectionSymbol="&lt;" wrapChar="" multilineAlign="4294967295" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" decimals="3" rightDirectionSymbol=">" formatNumbers="0"/>
-              <placement overlapHandling="AllowOverlapIfRequired" lineAnchorType="0" centroidInside="0" overrunDistance="0" centroidWhole="0" geometryGeneratorEnabled="0" rotationAngle="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" geometryGeneratorType="PointGeometry" quadOffset="4" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="2" xOffset="0" allowDegraded="1" lineAnchorTextPoint="CenterOfText" layerType="UnknownGeometry" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" maxCurvedCharAngleOut="-25" repeatDistance="0" offsetUnits="MM" repeatDistanceUnits="MM" dist="5" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" distUnits="MM" lineAnchorClipping="0" placementFlags="14" priority="5" overrunDistanceUnit="MM" maxCurvedCharAngleIn="25" geometryGenerator="" lineAnchorPercent="0.5" yOffset="0" rotationUnit="AngleDegrees"/>
-              <rendering fontMaxPixelSize="10000" drawLabels="1" mergeLines="1" zIndex="0" upsidedownLabels="0" obstacleFactor="1.8200000000000001" scaleVisibility="0" limitNumLabels="0" obstacleType="0" fontLimitPixelSize="0" maxNumLabels="2000" minFeatureSize="0" fontMinPixelSize="3" labelPerPart="0" obstacle="1" scaleMax="0" scaleMin="0" unplacedVisibility="0"/>
+              <text-format wrapChar="" rightDirectionSymbol=">" plussign="0" leftDirectionSymbol="&lt;" formatNumbers="0" decimals="3" multilineAlign="4294967295" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
+              <placement offsetUnits="MM" xOffset="0" maxCurvedCharAngleOut="-25" layerType="UnknownGeometry" allowDegraded="1" yOffset="0" overlapHandling="AllowOverlapIfRequired" geometryGeneratorType="PointGeometry" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" repeatDistanceUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25" quadOffset="4" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidWhole="0" overrunDistance="0" overrunDistanceUnit="MM" centroidInside="0" placement="2" geometryGenerator="" priority="5" distUnits="MM" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" dist="5" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorTextPoint="CenterOfText" polygonPlacementFlags="2" rotationUnit="AngleDegrees" offsetType="0" placementFlags="14" repeatDistance="0"/>
+              <rendering limitNumLabels="0" obstacleType="0" obstacle="1" scaleMax="0" maxNumLabels="2000" labelPerPart="0" scaleMin="0" upsidedownLabels="0" zIndex="0" unplacedVisibility="0" fontLimitPixelSize="0" minFeatureSize="0" fontMaxPixelSize="10000" scaleVisibility="0" fontMinPixelSize="3" drawLabels="1" mergeLines="1" obstacleFactor="1.8200000000000001"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="PositionX">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="auxiliary_storage_labeling_positionx" type="QString" name="field"/>
-                      <Option value="2" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="auxiliary_storage_labeling_positionx" name="field"/>
+                      <Option type="int" value="2" name="type"/>
                     </Option>
                     <Option type="Map" name="PositionY">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="auxiliary_storage_labeling_positiony" type="QString" name="field"/>
-                      <Option value="2" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="auxiliary_storage_labeling_positiony" name="field"/>
+                      <Option type="int" value="2" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+                  <Option type="int" value="0" name="blendMode"/>
                   <Option type="Map" name="ddProperties">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
-                  <Option value="false" type="bool" name="drawToAllParts"/>
-                  <Option value="0" type="QString" name="enabled"/>
-                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                  <Option value="&lt;symbol is_animated=&quot;0&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                  <Option value="0" type="double" name="minLength"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                  <Option value="MM" type="QString" name="minLengthUnit"/>
-                  <Option value="0" type="double" name="offsetFromAnchor"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                  <Option value="0" type="double" name="offsetFromLabel"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                  <Option type="bool" value="false" name="drawToAllParts"/>
+                  <Option type="QString" value="0" name="enabled"/>
+                  <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
+                  <Option type="QString" value="&lt;symbol alpha=&quot;1&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
+                  <Option type="double" value="0" name="minLength"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
+                  <Option type="QString" value="MM" name="minLengthUnit"/>
+                  <Option type="double" value="0" name="offsetFromAnchor"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
+                  <Option type="double" value="0" name="offsetFromLabel"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^(fenc|cone)')" key="{226e1338-ed15-4fc8-a035-fefee03c38d6}">
+          <rule key="{226e1338-ed15-4fc8-a035-fefee03c38d6}" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^(fenc|cone)')">
             <settings calloutType="simple">
-              <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="63" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="1" fieldName="round( $length, 1) || 'm'" useSubstitutions="0" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="11" namedStyle="Semibold" forcedItalic="0" isExpression="1" fontSizeUnit="Point" allowHtml="0" legendString="Aa">
+              <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="Semibold" fontUnderline="0" fieldName="round( $length, 1) || 'm'" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" useSubstitutions="0" fontWeight="63" fontStrikeout="0" fontItalic="0" fontSize="11" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" isExpression="1" legendString="Aa" textOrientation="horizontal">
                 <families/>
-                <text-buffer bufferNoFill="1" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferDraw="1" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="0"/>
-                <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeBorderWidth="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-                  <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+                <text-buffer bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+                <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskType="0"/>
+                <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
+                  <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="255,255,255,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                        <Option value="no" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="255,255,255,255" name="color"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                        <Option type="QString" value="no" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="255,255,255,255"/>
@@ -12439,88 +12441,88 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option type="Map" name="properties">
                       <Option type="Map" name="AlwaysShow">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="QString" name="expression"/>
-                        <Option value="3" type="int" name="type"/>
+                        <Option type="bool" value="false" name="active"/>
+                        <Option type="QString" value="1" name="expression"/>
+                        <Option type="int" value="3" name="type"/>
                       </Option>
                       <Option type="Map" name="PositionX">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="auxiliary_storage_labeling_positionx" type="QString" name="field"/>
-                        <Option value="2" type="int" name="type"/>
+                        <Option type="bool" value="true" name="active"/>
+                        <Option type="QString" value="auxiliary_storage_labeling_positionx" name="field"/>
+                        <Option type="int" value="2" name="type"/>
                       </Option>
                       <Option type="Map" name="PositionY">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="auxiliary_storage_labeling_positiony" type="QString" name="field"/>
-                        <Option value="2" type="int" name="type"/>
+                        <Option type="bool" value="true" name="active"/>
+                        <Option type="QString" value="auxiliary_storage_labeling_positiony" name="field"/>
+                        <Option type="int" value="2" name="type"/>
                       </Option>
                     </Option>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format useMaxLineLengthForAutoWrap="1" leftDirectionSymbol="&lt;" wrapChar="" multilineAlign="4294967295" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" decimals="3" rightDirectionSymbol=">" formatNumbers="0"/>
-              <placement overlapHandling="AllowOverlapIfRequired" lineAnchorType="0" centroidInside="0" overrunDistance="0" centroidWhole="0" geometryGeneratorEnabled="0" rotationAngle="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" geometryGeneratorType="PointGeometry" quadOffset="4" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="2" xOffset="0" allowDegraded="1" lineAnchorTextPoint="CenterOfText" layerType="UnknownGeometry" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" maxCurvedCharAngleOut="-25" repeatDistance="0" offsetUnits="MM" repeatDistanceUnits="MM" dist="1" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" distUnits="MM" lineAnchorClipping="0" placementFlags="14" priority="6" overrunDistanceUnit="MM" maxCurvedCharAngleIn="25" geometryGenerator="" lineAnchorPercent="0.5" yOffset="0" rotationUnit="AngleDegrees"/>
-              <rendering fontMaxPixelSize="10000" drawLabels="1" mergeLines="0" zIndex="0" upsidedownLabels="0" obstacleFactor="1" scaleVisibility="0" limitNumLabels="0" obstacleType="0" fontLimitPixelSize="0" maxNumLabels="2000" minFeatureSize="0" fontMinPixelSize="3" labelPerPart="0" obstacle="1" scaleMax="0" scaleMin="0" unplacedVisibility="0"/>
+              <text-format wrapChar="" rightDirectionSymbol=">" plussign="0" leftDirectionSymbol="&lt;" formatNumbers="0" decimals="3" multilineAlign="4294967295" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
+              <placement offsetUnits="MM" xOffset="0" maxCurvedCharAngleOut="-25" layerType="UnknownGeometry" allowDegraded="1" yOffset="0" overlapHandling="AllowOverlapIfRequired" geometryGeneratorType="PointGeometry" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" repeatDistanceUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25" quadOffset="4" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidWhole="0" overrunDistance="0" overrunDistanceUnit="MM" centroidInside="0" placement="2" geometryGenerator="" priority="6" distUnits="MM" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" dist="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorTextPoint="CenterOfText" polygonPlacementFlags="2" rotationUnit="AngleDegrees" offsetType="0" placementFlags="14" repeatDistance="0"/>
+              <rendering limitNumLabels="0" obstacleType="0" obstacle="1" scaleMax="0" maxNumLabels="2000" labelPerPart="0" scaleMin="0" upsidedownLabels="0" zIndex="0" unplacedVisibility="0" fontLimitPixelSize="0" minFeatureSize="0" fontMaxPixelSize="10000" scaleVisibility="0" fontMinPixelSize="3" drawLabels="1" mergeLines="0" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="AlwaysShow">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="QString" value="1" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="PositionX">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="auxiliary_storage_labeling_positionx" type="QString" name="field"/>
-                      <Option value="2" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="auxiliary_storage_labeling_positionx" name="field"/>
+                      <Option type="int" value="2" name="type"/>
                     </Option>
                     <Option type="Map" name="PositionY">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="auxiliary_storage_labeling_positiony" type="QString" name="field"/>
-                      <Option value="2" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="auxiliary_storage_labeling_positiony" name="field"/>
+                      <Option type="int" value="2" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+                  <Option type="int" value="0" name="blendMode"/>
                   <Option type="Map" name="ddProperties">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
-                  <Option value="false" type="bool" name="drawToAllParts"/>
-                  <Option value="0" type="QString" name="enabled"/>
-                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                  <Option value="&lt;symbol is_animated=&quot;0&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                  <Option value="0" type="double" name="minLength"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                  <Option value="MM" type="QString" name="minLengthUnit"/>
-                  <Option value="0" type="double" name="offsetFromAnchor"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                  <Option value="0" type="double" name="offsetFromLabel"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                  <Option type="bool" value="false" name="drawToAllParts"/>
+                  <Option type="QString" value="0" name="enabled"/>
+                  <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
+                  <Option type="QString" value="&lt;symbol alpha=&quot;1&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
+                  <Option type="double" value="0" name="minLength"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
+                  <Option type="QString" value="MM" name="minLengthUnit"/>
+                  <Option type="double" value="0" name="offsetFromAnchor"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
+                  <Option type="double" value="0" name="offsetFromLabel"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
@@ -12529,11 +12531,11 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option value="id" type="QString" name="dualview/previewExpressions"/>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="QString" value="copy" name="QFieldSync/action"/>
+          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="id" name="dualview/previewExpressions"/>
+          <Option type="QString" value="0" name="embeddedWidgets/count"/>
           <Option type="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -12541,48 +12543,48 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory penAlpha="255" width="15" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" minimumSize="0" enabled="0" maxScaleDenominator="1e+08" diagramOrientation="Up" opacity="1" scaleBasedVisibility="0" spacingUnit="MM" minScaleDenominator="0" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" lineSizeType="MM" penWidth="0" backgroundAlpha="255" scaleDependency="Area" spacing="0" direction="1" barWidth="5" sizeType="MM" height="15" penColor="#000000" showAxis="0">
-          <fontProperties bold="0" style="" italic="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0"/>
-          <attribute label="" colorOpacity="1" field="" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory height="15" scaleDependency="Area" width="15" lineSizeScale="3x:0,0,0,0,0,0" spacingUnit="MM" lineSizeType="MM" penColor="#000000" spacing="0" labelPlacementMethod="XHeight" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" backgroundAlpha="255" maxScaleDenominator="1e+08" barWidth="5" penWidth="0" minimumSize="0" penAlpha="255" minScaleDenominator="0" sizeType="MM" backgroundColor="#ffffff" enabled="0" opacity="1" direction="1" scaleBasedVisibility="0" showAxis="0" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270">
+          <fontProperties style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0" strikethrough="0" italic="0" underline="0" bold="0"/>
+          <attribute color="#000000" field="" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="35,35,35,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0.26" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -12613,9 +12615,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -12623,20 +12625,20 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" showAll="1" placement="2" zIndex="0" dist="0" priority="0" obstacle="0">
+      <DiagramLayerSettings priority="0" linePlacementFlags="18" obstacle="0" dist="0" zIndex="0" placement="2" showAll="1">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field configurationFlags="None" name="id">
@@ -12704,69 +12706,69 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
-        <alias index="1" name="" field="group"/>
-        <alias index="2" name="" field="comment"/>
-        <alias index="3" name="" field="moveable"/>
-        <alias index="4" name="" field="type"/>
-        <alias index="5" name="" field="name"/>
-        <alias index="6" name="" field="hidden"/>
-        <alias index="7" name="" field="fence_len"/>
-        <alias index="8" name="" field="cone_len"/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="group" name=""/>
+        <alias index="2" field="comment" name=""/>
+        <alias index="3" field="moveable" name=""/>
+        <alias index="4" field="type" name=""/>
+        <alias index="5" field="name" name=""/>
+        <alias index="6" field="hidden" name=""/>
+        <alias index="7" field="fence_len" name=""/>
+        <alias index="8" field="cone_len" name=""/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="group"/>
-        <default applyOnUpdate="0" expression="" field="comment"/>
-        <default applyOnUpdate="0" expression="" field="moveable"/>
-        <default applyOnUpdate="0" expression="" field="type"/>
-        <default applyOnUpdate="0" expression="" field="name"/>
-        <default applyOnUpdate="0" expression="" field="hidden"/>
-        <default applyOnUpdate="0" expression="" field="fence_len"/>
-        <default applyOnUpdate="0" expression="" field="cone_len"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="group" expression=""/>
+        <default applyOnUpdate="0" field="comment" expression=""/>
+        <default applyOnUpdate="0" field="moveable" expression=""/>
+        <default applyOnUpdate="0" field="type" expression=""/>
+        <default applyOnUpdate="0" field="name" expression=""/>
+        <default applyOnUpdate="0" field="hidden" expression=""/>
+        <default applyOnUpdate="0" field="fence_len" expression=""/>
+        <default applyOnUpdate="0" field="cone_len" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="id" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="group" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="comment" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="moveable" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="type" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="name" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="hidden" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="fence_len" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="cone_len" constraints="0"/>
+        <constraint exp_strength="0" field="id" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="group" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="comment" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="moveable" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="type" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="name" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="hidden" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="fence_len" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="cone_len" notnull_strength="0" constraints="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" desc="" field="id"/>
-        <constraint exp="" desc="" field="group"/>
-        <constraint exp="" desc="" field="comment"/>
-        <constraint exp="" desc="" field="moveable"/>
-        <constraint exp="" desc="" field="type"/>
-        <constraint exp="" desc="" field="name"/>
-        <constraint exp="" desc="" field="hidden"/>
-        <constraint exp="" desc="" field="fence_len"/>
-        <constraint exp="" desc="" field="cone_len"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="group" desc=""/>
+        <constraint exp="" field="comment" desc=""/>
+        <constraint exp="" field="moveable" desc=""/>
+        <constraint exp="" field="type" desc=""/>
+        <constraint exp="" field="name" desc=""/>
+        <constraint exp="" field="hidden" desc=""/>
+        <constraint exp="" field="fence_len" desc=""/>
+        <constraint exp="" field="cone_len" desc=""/>
       </constraintExpressions>
       <expressionfields>
-        <field typeName="double precision" subType="0" type="6" name="fence_len" precision="0" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" length="-1" comment=""/>
-        <field typeName="double precision" subType="0" type="6" name="fence_len" precision="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" length="-1" comment=""/>
-        <field typeName="double precision" subType="0" type="6" name="cone_len" precision="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" length="-1" comment=""/>
+        <field precision="0" comment="" type="6" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" length="-1" subType="0" typeName="double precision" name="fence_len"/>
+        <field precision="0" comment="" type="6" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" length="-1" subType="0" typeName="double precision" name="fence_len"/>
+        <field precision="0" comment="" type="6" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" length="-1" subType="0" typeName="double precision" name="cone_len"/>
       </expressionfields>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="&quot;group&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="&quot;group&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column width="-1" type="field" name="id" hidden="0"/>
-          <column width="-1" type="field" name="group" hidden="0"/>
+          <column width="-1" type="field" hidden="0" name="id"/>
+          <column width="-1" type="field" hidden="0" name="group"/>
           <column width="-1" type="actions" hidden="1"/>
-          <column width="373" type="field" name="comment" hidden="0"/>
-          <column width="-1" type="field" name="moveable" hidden="0"/>
-          <column width="-1" type="field" name="type" hidden="0"/>
-          <column width="692" type="field" name="name" hidden="0"/>
-          <column width="-1" type="field" name="hidden" hidden="0"/>
-          <column width="-1" type="field" name="fence_len" hidden="0"/>
-          <column width="-1" type="field" name="cone_len" hidden="0"/>
+          <column width="373" type="field" hidden="0" name="comment"/>
+          <column width="-1" type="field" hidden="0" name="moveable"/>
+          <column width="-1" type="field" hidden="0" name="type"/>
+          <column width="692" type="field" hidden="0" name="name"/>
+          <column width="-1" type="field" hidden="0" name="hidden"/>
+          <column width="-1" type="field" hidden="0" name="fence_len"/>
+          <column width="-1" type="field" hidden="0" name="cone_len"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -12798,32 +12800,32 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="auxiliary_storage_labeling_positionx" editable="0"/>
-        <field name="auxiliary_storage_labeling_positiony" editable="0"/>
-        <field name="comment" editable="1"/>
-        <field name="cone_len" editable="0"/>
-        <field name="fence_len" editable="0"/>
-        <field name="group" editable="1"/>
-        <field name="hidden" editable="1"/>
-        <field name="id" editable="1"/>
-        <field name="length" editable="0"/>
-        <field name="moveable" editable="1"/>
-        <field name="name" editable="1"/>
-        <field name="type" editable="1"/>
+        <field editable="0" name="auxiliary_storage_labeling_positionx"/>
+        <field editable="0" name="auxiliary_storage_labeling_positiony"/>
+        <field editable="1" name="comment"/>
+        <field editable="0" name="cone_len"/>
+        <field editable="0" name="fence_len"/>
+        <field editable="1" name="group"/>
+        <field editable="1" name="hidden"/>
+        <field editable="1" name="id"/>
+        <field editable="0" name="length"/>
+        <field editable="1" name="moveable"/>
+        <field editable="1" name="name"/>
+        <field editable="1" name="type"/>
       </editable>
       <labelOnTop>
-        <field name="auxiliary_storage_labeling_positionx" labelOnTop="0"/>
-        <field name="auxiliary_storage_labeling_positiony" labelOnTop="0"/>
-        <field name="comment" labelOnTop="0"/>
-        <field name="cone_len" labelOnTop="0"/>
-        <field name="fence_len" labelOnTop="0"/>
-        <field name="group" labelOnTop="0"/>
-        <field name="hidden" labelOnTop="0"/>
-        <field name="id" labelOnTop="0"/>
-        <field name="length" labelOnTop="0"/>
-        <field name="moveable" labelOnTop="0"/>
-        <field name="name" labelOnTop="0"/>
-        <field name="type" labelOnTop="0"/>
+        <field labelOnTop="0" name="auxiliary_storage_labeling_positionx"/>
+        <field labelOnTop="0" name="auxiliary_storage_labeling_positiony"/>
+        <field labelOnTop="0" name="comment"/>
+        <field labelOnTop="0" name="cone_len"/>
+        <field labelOnTop="0" name="fence_len"/>
+        <field labelOnTop="0" name="group"/>
+        <field labelOnTop="0" name="hidden"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="length"/>
+        <field labelOnTop="0" name="moveable"/>
+        <field labelOnTop="0" name="name"/>
+        <field labelOnTop="0" name="type"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -12831,7 +12833,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" simplifyLocal="1" autoRefreshTime="0" wkbType="MultiLineString" simplifyDrawingHints="1" type="vector" symbologyReferenceScale="-1" minScale="100000000" legendPlaceholderImage="" refreshOnNotifyEnabled="0" labelsEnabled="0" maxScale="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" refreshOnNotifyMessage="" readOnly="0" geometry="Line" autoRefreshEnabled="0" simplifyDrawingTol="1">
+    <maplayer simplifyLocal="1" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1" legendPlaceholderImage="" symbologyReferenceScale="-1" readOnly="0" refreshOnNotifyEnabled="0" minScale="100000000" maxScale="0" type="vector" autoRefreshTime="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="0" styleCategories="AllStyleCategories" geometry="Line" autoRefreshEnabled="0" wkbType="MultiLineString">
       <extent>
         <xmin>18.39891270000000034</xmin>
         <ymin>-33.90990359999999981</ymin>
@@ -12904,58 +12906,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" startExpression="" mode="0" limitMode="0" endField="" fixedDuration="0" accumulate="0" durationUnit="min" startField="" endExpression="" enabled="0">
+      <temporal durationField="" fixedDuration="0" accumulate="0" endField="" startField="" enabled="0" startExpression="" endExpression="" durationUnit="min" mode="0" limitMode="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" zscale="1" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" binding="Centroid" type="IndividualFeatures" symbology="Line" extrusion="0" zoffset="0">
+      <elevation extrusionEnabled="0" symbology="Line" type="IndividualFeatures" zscale="1" clamping="Terrain" showMarkerSymbolInSurfacePlots="0" zoffset="0" extrusion="0" respectLayerSymbol="1" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="164,113,88,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="164,113,88,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -12986,36 +12988,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="164,113,88,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="117,81,63,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="164,113,88,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="117,81,63,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="164,113,88,255"/>
@@ -13030,44 +13032,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="164,113,88,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="117,81,63,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="164,113,88,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="diamond" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="117,81,63,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="3" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -13090,54 +13092,54 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" type="singleSymbol" symbollevels="0" referencescale="-1" enableorderby="0">
+      <renderer-v2 enableorderby="0" type="singleSymbol" symbollevels="0" referencescale="-1" forceraster="0">
         <symbols>
-          <symbol is_animated="0" type="line" name="0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,178,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="1" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,178,0,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="1" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -13168,9 +13170,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -13181,11 +13183,11 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option value="&quot;id&quot;" type="QString" name="dualview/previewExpressions"/>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="QString" value="copy" name="QFieldSync/action"/>
+          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="&quot;id&quot;" name="dualview/previewExpressions"/>
+          <Option type="QString" value="0" name="embeddedWidgets/count"/>
           <Option type="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -13193,48 +13195,48 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory penAlpha="255" width="15" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" minimumSize="0" enabled="0" maxScaleDenominator="1e+08" diagramOrientation="Up" opacity="1" scaleBasedVisibility="0" spacingUnit="MM" minScaleDenominator="0" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" lineSizeType="MM" penWidth="0" backgroundAlpha="255" scaleDependency="Area" spacing="0" direction="1" barWidth="5" sizeType="MM" height="15" penColor="#000000" showAxis="0">
-          <fontProperties bold="0" style="0" italic="1" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" strikethrough="0"/>
-          <attribute label="" colorOpacity="1" field="" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory height="15" scaleDependency="Area" width="15" lineSizeScale="3x:0,0,0,0,0,0" spacingUnit="MM" lineSizeType="MM" penColor="#000000" spacing="0" labelPlacementMethod="XHeight" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" backgroundAlpha="255" maxScaleDenominator="1e+08" barWidth="5" penWidth="0" minimumSize="0" penAlpha="255" minScaleDenominator="0" sizeType="MM" backgroundColor="#ffffff" enabled="0" opacity="1" direction="1" scaleBasedVisibility="0" showAxis="0" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270">
+          <fontProperties style="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" strikethrough="0" italic="1" underline="0" bold="0"/>
+          <attribute color="#000000" field="" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="35,35,35,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0.26" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -13265,9 +13267,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -13275,20 +13277,20 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" showAll="1" placement="2" zIndex="0" dist="0" priority="0" obstacle="0">
+      <DiagramLayerSettings priority="0" linePlacementFlags="18" obstacle="0" dist="0" zIndex="0" placement="2" showAll="1">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field configurationFlags="None" name="id">
@@ -13300,24 +13302,24 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
+        <alias index="0" field="id" name=""/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="id" constraints="0"/>
+        <constraint exp_strength="0" field="id" notnull_strength="0" constraints="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" desc="" field="id"/>
+        <constraint exp="" field="id" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column width="-1" type="field" name="id" hidden="0"/>
+          <column width="-1" type="field" hidden="0" name="id"/>
           <column width="-1" type="actions" hidden="1"/>
         </columns>
       </attributetableconfig>
@@ -13350,10 +13352,10 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="id" editable="1"/>
+        <field editable="1" name="id"/>
       </editable>
       <labelOnTop>
-        <field name="id" labelOnTop="0"/>
+        <field labelOnTop="0" name="id"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -13361,7 +13363,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" simplifyLocal="1" autoRefreshTime="0" wkbType="MultiPolygon" simplifyDrawingHints="1" type="vector" symbologyReferenceScale="-1" minScale="100000000" legendPlaceholderImage="" refreshOnNotifyEnabled="0" labelsEnabled="0" maxScale="100000" styleCategories="AllStyleCategories" simplifyAlgorithm="0" refreshOnNotifyMessage="" readOnly="0" geometry="Polygon" autoRefreshEnabled="0" simplifyDrawingTol="1">
+    <maplayer simplifyLocal="1" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1" legendPlaceholderImage="" symbologyReferenceScale="-1" readOnly="0" refreshOnNotifyEnabled="0" minScale="100000000" maxScale="100000" type="vector" autoRefreshTime="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="0" styleCategories="AllStyleCategories" geometry="Polygon" autoRefreshEnabled="0" wkbType="MultiPolygon">
       <extent>
         <xmin>18.36924763341120581</xmin>
         <ymin>-33.95871753779982782</ymin>
@@ -13434,58 +13436,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" startExpression="" mode="0" limitMode="0" endField="" fixedDuration="0" accumulate="0" durationUnit="min" startField="" endExpression="" enabled="0">
+      <temporal durationField="" fixedDuration="0" accumulate="0" endField="" startField="" enabled="0" startExpression="" endExpression="" durationUnit="min" mode="0" limitMode="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" zscale="1" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" binding="Centroid" type="IndividualFeatures" symbology="Line" extrusion="0" zoffset="0">
+      <elevation extrusionEnabled="0" symbology="Line" type="IndividualFeatures" zscale="1" clamping="Terrain" showMarkerSymbolInSurfacePlots="0" zoffset="0" extrusion="0" respectLayerSymbol="1" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="213,180,60,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="213,180,60,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -13516,36 +13518,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="213,180,60,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="152,129,43,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="213,180,60,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="152,129,43,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="213,180,60,255"/>
@@ -13560,44 +13562,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="213,180,60,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="152,129,43,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="213,180,60,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="diamond" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="152,129,43,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="3" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -13620,38 +13622,38 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" type="singleSymbol" symbollevels="0" referencescale="-1" enableorderby="0">
+      <renderer-v2 enableorderby="0" type="singleSymbol" symbollevels="0" referencescale="-1" forceraster="0">
         <symbols>
-          <symbol is_animated="0" type="fill" name="0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="26,0,201,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                <Option value="dot" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="b_diagonal" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="26,0,201,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                <Option type="QString" value="dot" name="outline_style"/>
+                <Option type="QString" value="0.26" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="b_diagonal" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="26,0,201,255"/>
@@ -13666,9 +13668,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="b_diagonal"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -13679,20 +13681,20 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="copy" name="QFieldSync/action"/>
+          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
           <Option type="List" name="dualview/previewExpressions">
-            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
           </Option>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="QString" value="0" name="embeddedWidgets/count"/>
           <Option type="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -13700,48 +13702,48 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory penAlpha="255" width="15" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" minimumSize="0" enabled="0" maxScaleDenominator="1e+08" diagramOrientation="Up" opacity="1" scaleBasedVisibility="0" spacingUnit="MM" minScaleDenominator="100000" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" lineSizeType="MM" penWidth="0" backgroundAlpha="255" scaleDependency="Area" spacing="0" direction="1" barWidth="5" sizeType="MM" height="15" penColor="#000000" showAxis="0">
-          <fontProperties bold="0" style="" italic="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0"/>
-          <attribute label="" colorOpacity="1" field="" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory height="15" scaleDependency="Area" width="15" lineSizeScale="3x:0,0,0,0,0,0" spacingUnit="MM" lineSizeType="MM" penColor="#000000" spacing="0" labelPlacementMethod="XHeight" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" backgroundAlpha="255" maxScaleDenominator="1e+08" barWidth="5" penWidth="0" minimumSize="0" penAlpha="255" minScaleDenominator="100000" sizeType="MM" backgroundColor="#ffffff" enabled="0" opacity="1" direction="1" scaleBasedVisibility="0" showAxis="0" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270">
+          <fontProperties style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0" strikethrough="0" italic="0" underline="0" bold="0"/>
+          <attribute color="#000000" field="" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="35,35,35,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0.26" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -13772,9 +13774,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -13782,34 +13784,34 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="2" showAll="1" placement="0" zIndex="0" dist="0" priority="0" obstacle="0">
+      <DiagramLayerSettings priority="0" linePlacementFlags="2" obstacle="0" dist="0" zIndex="0" placement="0" showAll="1">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option type="Map" name="properties">
               <Option type="Map" name="show">
-                <Option value="true" type="bool" name="active"/>
-                <Option value="id" type="QString" name="field"/>
-                <Option value="2" type="int" name="type"/>
+                <Option type="bool" value="true" name="active"/>
+                <Option type="QString" value="id" name="field"/>
+                <Option type="int" value="2" name="type"/>
               </Option>
             </Option>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field configurationFlags="None" name="id">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -13818,8 +13820,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -13828,8 +13830,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -13843,40 +13845,40 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
-        <alias index="1" name="" field="type"/>
-        <alias index="2" name="" field="page"/>
-        <alias index="3" name="" field="day"/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="type" name=""/>
+        <alias index="2" field="page" name=""/>
+        <alias index="3" field="day" name=""/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="type"/>
-        <default applyOnUpdate="0" expression="" field="page"/>
-        <default applyOnUpdate="0" expression="" field="day"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="type" expression=""/>
+        <default applyOnUpdate="0" field="page" expression=""/>
+        <default applyOnUpdate="0" field="day" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="id" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="type" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="page" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="day" constraints="0"/>
+        <constraint exp_strength="0" field="id" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="type" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="page" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="day" notnull_strength="0" constraints="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" desc="" field="id"/>
-        <constraint exp="" desc="" field="type"/>
-        <constraint exp="" desc="" field="page"/>
-        <constraint exp="" desc="" field="day"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="type" desc=""/>
+        <constraint exp="" field="page" desc=""/>
+        <constraint exp="" field="day" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="&quot;page&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="&quot;page&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
           <column width="-1" type="actions" hidden="1"/>
-          <column width="-1" type="field" name="id" hidden="0"/>
-          <column width="-1" type="field" name="type" hidden="0"/>
-          <column width="-1" type="field" name="day" hidden="0"/>
-          <column width="-1" type="field" name="page" hidden="0"/>
+          <column width="-1" type="field" hidden="0" name="id"/>
+          <column width="-1" type="field" hidden="0" name="type"/>
+          <column width="-1" type="field" hidden="0" name="day"/>
+          <column width="-1" type="field" hidden="0" name="page"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -13908,14 +13910,14 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="id" editable="1"/>
-        <field name="page" editable="1"/>
-        <field name="type" editable="1"/>
+        <field editable="1" name="id"/>
+        <field editable="1" name="page"/>
+        <field editable="1" name="type"/>
       </editable>
       <labelOnTop>
-        <field name="id" labelOnTop="0"/>
-        <field name="page" labelOnTop="0"/>
-        <field name="type" labelOnTop="0"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="page"/>
+        <field labelOnTop="0" name="type"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -13923,7 +13925,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" simplifyLocal="1" autoRefreshTime="0" wkbType="Point" simplifyDrawingHints="0" type="vector" symbologyReferenceScale="-1" minScale="100000000" legendPlaceholderImage="" refreshOnNotifyEnabled="0" labelsEnabled="1" maxScale="100000" styleCategories="AllStyleCategories" simplifyAlgorithm="0" refreshOnNotifyMessage="" readOnly="0" geometry="Point" autoRefreshEnabled="0" simplifyDrawingTol="1">
+    <maplayer simplifyLocal="1" simplifyDrawingHints="0" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1" legendPlaceholderImage="" symbologyReferenceScale="-1" readOnly="0" refreshOnNotifyEnabled="0" minScale="100000000" maxScale="100000" type="vector" autoRefreshTime="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="1" styleCategories="AllStyleCategories" geometry="Point" autoRefreshEnabled="0" wkbType="Point">
       <extent>
         <xmin>18.37523075794307204</xmin>
         <ymin>-33.95575166047164828</ymin>
@@ -13988,7 +13990,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxy="0" minz="0" dimensions="2" maxx="0" maxz="0" miny="0" minx="0" crs=""/>
+          <spatial maxz="0" minx="0" maxx="0" minz="0" crs="" miny="0" maxy="0" dimensions="2"/>
           <temporal>
             <period>
               <start></start>
@@ -13999,7 +14001,7 @@ def my_form_open(dialog, layer, feature):
       </resourceMetadata>
       <provider encoding="UTF-8">ogr</provider>
       <vectorjoins>
-        <join targetFieldName="position" joinLayerId="marshals_by_position20161003112326575" joinFieldName="position" cascadedDelete="0" memoryCache="0" dynamicForm="0" editable="0" hasCustomPrefix="1" upsertOnEdit="0" customPrefix="csv_">
+        <join joinFieldName="position" targetFieldName="position" cascadedDelete="0" hasCustomPrefix="1" customPrefix="csv_" joinLayerId="marshals_by_position20161003112326575" dynamicForm="0" upsertOnEdit="0" memoryCache="0" editable="0">
           <joinFieldsSubset>
             <field name="position"/>
             <field name="club"/>
@@ -14026,58 +14028,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="id" startExpression="" mode="0" limitMode="0" endField="" fixedDuration="0" accumulate="0" durationUnit="min" startField="" endExpression="" enabled="0">
+      <temporal durationField="id" fixedDuration="0" accumulate="0" endField="" startField="" enabled="0" startExpression="" endExpression="" durationUnit="min" mode="0" limitMode="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" zscale="1" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" binding="Centroid" type="IndividualFeatures" symbology="Line" extrusion="0" zoffset="0">
+      <elevation extrusionEnabled="0" symbology="Line" type="IndividualFeatures" zscale="1" clamping="Terrain" showMarkerSymbolInSurfacePlots="0" zoffset="0" extrusion="0" respectLayerSymbol="1" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="114,155,111,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="114,155,111,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -14108,36 +14110,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="114,155,111,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="81,111,79,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="114,155,111,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="81,111,79,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="114,155,111,255"/>
@@ -14152,44 +14154,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="114,155,111,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="81,111,79,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="114,155,111,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="diamond" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="81,111,79,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="3" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -14212,51 +14214,51 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" type="RuleRenderer" symbollevels="0" referencescale="-1" enableorderby="0">
+      <renderer-v2 enableorderby="0" type="RuleRenderer" symbollevels="0" referencescale="-1" forceraster="0">
         <rules key="{436a5e05-3485-477a-80b7-cf4d12d6dcec}">
-          <rule filter="'marshal plan' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" description="Show in marshal overview" symbol="0" label="Show by day in marshal plan" key="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
-          <rule filter="'marshal plan' = attribute( @atlas_feature , 'type' )" symbol="1" label="Always show in marshal plan" key="{308d81eb-cefa-4627-8afb-3baa8363f863}"/>
-          <rule filter="'marshal' = attribute( @atlas_feature , 'type' ) 'marshal plan' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;csv_days&quot; )" description="Show in marshal overview" symbol="2" label="Show in marshal maps" checkstate="0" key="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}"/>
+          <rule description="Show in marshal overview" symbol="0" label="Show by day in marshal plan" key="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}" filter="'marshal plan' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )"/>
+          <rule symbol="1" label="Always show in marshal plan" key="{308d81eb-cefa-4627-8afb-3baa8363f863}" filter="'marshal plan' = attribute( @atlas_feature , 'type' )"/>
+          <rule description="Show in marshal overview" symbol="2" label="Show in marshal maps" key="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}" filter="'marshal' = attribute( @atlas_feature , 'type' ) 'marshal plan' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;csv_days&quot; )" checkstate="0"/>
         </rules>
         <symbols>
-          <symbol is_animated="0" type="marker" name="0" clip_to_extent="1" alpha="0.8" force_rhr="0" frame_rate="10">
+          <symbol alpha="0.8" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="1" class="SimpleMarker" enabled="1">
+            <layer locked="0" class="SimpleMarker" enabled="1" pass="1">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="255,255,255,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="circle" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="5" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="Pixel" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="255,255,255,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="circle" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="5" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="Pixel" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -14279,42 +14281,42 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" type="marker" name="1" clip_to_extent="1" alpha="0.8" force_rhr="0" frame_rate="10">
+          <symbol alpha="0.8" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="1" class="SimpleMarker" enabled="1">
+            <layer locked="0" class="SimpleMarker" enabled="1" pass="1">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="255,255,255,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="circle" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="5" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="Pixel" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="255,255,255,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="circle" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="5" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="Pixel" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -14337,42 +14339,42 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" type="marker" name="2" clip_to_extent="1" alpha="0.01" force_rhr="0" frame_rate="10">
+          <symbol alpha="0.01" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="2">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="1" class="SimpleMarker" enabled="1">
+            <layer locked="0" class="SimpleMarker" enabled="1" pass="1">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="0,0,0,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="circle" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="0.1" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="0,0,0,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="circle" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="0.1" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -14395,9 +14397,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -14406,42 +14408,42 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="rule-based">
         <rules key="{a69c392f-7c45-4a75-a992-731572d96e04}">
-          <rule active="0" filter="regexp_match( attribute( @atlas_feature , 'type' ), 'marshal plan') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" description="Show by day in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)" key="{500cb2dd-2062-4b02-bba6-05c13c814f8b}">
+          <rule description="Show by day in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)" active="0" key="{500cb2dd-2062-4b02-bba6-05c13c814f8b}" filter="regexp_match( attribute( @atlas_feature , 'type' ), 'marshal plan') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )">
             <settings calloutType="simple">
-              <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="63" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="0.90000000000000002" fieldName="position" useSubstitutions="0" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="6" namedStyle="Semibold" forcedItalic="0" isExpression="0" fontSizeUnit="Point" allowHtml="0" legendString="Aa">
+              <text-style textOpacity="0.90000000000000002" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="Semibold" fontUnderline="0" fieldName="position" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" useSubstitutions="0" fontWeight="63" fontStrikeout="0" fontItalic="0" fontSize="6" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" isExpression="0" legendString="Aa" textOrientation="horizontal">
                 <families/>
-                <text-buffer bufferNoFill="0" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="0"/>
-                <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeDraw="1" shapeBorderWidth="0.10000000000000001" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0" shapeType="3" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="0,0,0,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="0.5" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-                  <symbol is_animated="0" type="marker" name="markerSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+                <text-buffer bufferNoFill="0" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+                <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskType="0"/>
+                <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="0,0,0,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="1" shapeType="3" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0.10000000000000001" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="0.5" shapeSizeY="0" shapeRadiiX="0">
+                  <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="markerSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                    <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
                       <Option type="Map">
-                        <Option value="0" type="QString" name="angle"/>
-                        <Option value="square" type="QString" name="cap_style"/>
-                        <Option value="231,113,72,255" type="QString" name="color"/>
-                        <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="circle" type="QString" name="name"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="diameter" type="QString" name="scale_method"/>
-                        <Option value="2" type="QString" name="size"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="size_unit"/>
-                        <Option value="1" type="QString" name="vertical_anchor_point"/>
+                        <Option type="QString" value="0" name="angle"/>
+                        <Option type="QString" value="square" name="cap_style"/>
+                        <Option type="QString" value="231,113,72,255" name="color"/>
+                        <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="circle" name="name"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="diameter" name="scale_method"/>
+                        <Option type="QString" value="2" name="size"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="size_unit"/>
+                        <Option type="QString" value="1" name="vertical_anchor_point"/>
                       </Option>
                       <prop k="angle" v="0"/>
                       <prop k="cap_style" v="square"/>
@@ -14464,34 +14466,34 @@ def my_form_open(dialog, layer, feature):
                       <prop k="vertical_anchor_point" v="1"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+                  <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="255,255,255,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0.1" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="255,255,255,255" name="color"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0.1" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="255,255,255,255"/>
@@ -14506,118 +14508,118 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option value="false" type="bool" name="active"/>
-                              <Option value="1" type="int" name="type"/>
-                              <Option value="" type="QString" name="val"/>
+                              <Option type="bool" value="false" name="active"/>
+                              <Option type="int" value="1" name="type"/>
+                              <Option type="QString" value="" name="val"/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format useMaxLineLengthForAutoWrap="1" leftDirectionSymbol="&lt;" wrapChar="" multilineAlign="0" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" decimals="3" rightDirectionSymbol=">" formatNumbers="0"/>
-              <placement overlapHandling="AllowOverlapIfRequired" lineAnchorType="0" centroidInside="0" overrunDistance="0" centroidWhole="0" geometryGeneratorEnabled="0" rotationAngle="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" geometryGeneratorType="PointGeometry" quadOffset="4" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="6" xOffset="0" allowDegraded="1" lineAnchorTextPoint="CenterOfText" layerType="PointGeometry" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" maxCurvedCharAngleOut="-20" repeatDistance="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" dist="1" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" distUnits="MM" lineAnchorClipping="0" placementFlags="10" priority="10" overrunDistanceUnit="MM" maxCurvedCharAngleIn="20" geometryGenerator="" lineAnchorPercent="0.5" yOffset="0" rotationUnit="AngleDegrees"/>
-              <rendering fontMaxPixelSize="10000" drawLabels="1" mergeLines="0" zIndex="2" upsidedownLabels="0" obstacleFactor="1" scaleVisibility="0" limitNumLabels="0" obstacleType="0" fontLimitPixelSize="0" maxNumLabels="2000" minFeatureSize="0" fontMinPixelSize="3" labelPerPart="0" obstacle="0" scaleMax="10000000" scaleMin="1" unplacedVisibility="0"/>
+              <text-format wrapChar="" rightDirectionSymbol=">" plussign="0" leftDirectionSymbol="&lt;" formatNumbers="0" decimals="3" multilineAlign="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
+              <placement offsetUnits="MapUnit" xOffset="0" maxCurvedCharAngleOut="-20" layerType="PointGeometry" allowDegraded="1" yOffset="0" overlapHandling="AllowOverlapIfRequired" geometryGeneratorType="PointGeometry" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" repeatDistanceUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" quadOffset="4" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidWhole="0" overrunDistance="0" overrunDistanceUnit="MM" centroidInside="0" placement="6" geometryGenerator="" priority="10" distUnits="MM" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" dist="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorTextPoint="CenterOfText" polygonPlacementFlags="2" rotationUnit="AngleDegrees" offsetType="0" placementFlags="10" repeatDistance="0"/>
+              <rendering limitNumLabels="0" obstacleType="0" obstacle="0" scaleMax="10000000" maxNumLabels="2000" labelPerPart="0" scaleMin="1" upsidedownLabels="0" zIndex="2" unplacedVisibility="0" fontLimitPixelSize="0" minFeatureSize="0" fontMaxPixelSize="10000" scaleVisibility="0" fontMinPixelSize="3" drawLabels="1" mergeLines="0" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="FontStyle">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="ShapeFillColor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="Size">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+                  <Option type="int" value="0" name="blendMode"/>
                   <Option type="Map" name="ddProperties">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
-                  <Option value="false" type="bool" name="drawToAllParts"/>
-                  <Option value="0" type="QString" name="enabled"/>
-                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                  <Option value="&lt;symbol is_animated=&quot;0&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                  <Option value="0" type="double" name="minLength"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                  <Option value="MM" type="QString" name="minLengthUnit"/>
-                  <Option value="0" type="double" name="offsetFromAnchor"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                  <Option value="0" type="double" name="offsetFromLabel"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                  <Option type="bool" value="false" name="drawToAllParts"/>
+                  <Option type="QString" value="0" name="enabled"/>
+                  <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
+                  <Option type="QString" value="&lt;symbol alpha=&quot;1&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
+                  <Option type="double" value="0" name="minLength"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
+                  <Option type="QString" value="MM" name="minLengthUnit"/>
+                  <Option type="double" value="0" name="offsetFromAnchor"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
+                  <Option type="double" value="0" name="offsetFromLabel"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule filter="regexp_match( attribute( @atlas_feature , 'type' ), 'marshal plan')" description="Always show in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)" key="{5dfe0a99-46ed-4158-aef2-a8ead8841c13}">
+          <rule description="Always show in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)" key="{5dfe0a99-46ed-4158-aef2-a8ead8841c13}" filter="regexp_match( attribute( @atlas_feature , 'type' ), 'marshal plan')">
             <settings calloutType="simple">
-              <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="63" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="0.90000000000000002" fieldName="position" useSubstitutions="0" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="6" namedStyle="Semibold" forcedItalic="0" isExpression="0" fontSizeUnit="Point" allowHtml="0" legendString="Aa">
+              <text-style textOpacity="0.90000000000000002" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="Semibold" fontUnderline="0" fieldName="position" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" useSubstitutions="0" fontWeight="63" fontStrikeout="0" fontItalic="0" fontSize="6" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" isExpression="0" legendString="Aa" textOrientation="horizontal">
                 <families/>
-                <text-buffer bufferNoFill="0" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="0"/>
-                <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeDraw="1" shapeBorderWidth="0.10000000000000001" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0" shapeType="3" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="0,0,0,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="0.5" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-                  <symbol is_animated="0" type="marker" name="markerSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+                <text-buffer bufferNoFill="0" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+                <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskType="0"/>
+                <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="0,0,0,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="1" shapeType="3" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0.10000000000000001" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="0.5" shapeSizeY="0" shapeRadiiX="0">
+                  <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="markerSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                    <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
                       <Option type="Map">
-                        <Option value="0" type="QString" name="angle"/>
-                        <Option value="square" type="QString" name="cap_style"/>
-                        <Option value="231,113,72,255" type="QString" name="color"/>
-                        <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="circle" type="QString" name="name"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="diameter" type="QString" name="scale_method"/>
-                        <Option value="2" type="QString" name="size"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="size_unit"/>
-                        <Option value="1" type="QString" name="vertical_anchor_point"/>
+                        <Option type="QString" value="0" name="angle"/>
+                        <Option type="QString" value="square" name="cap_style"/>
+                        <Option type="QString" value="231,113,72,255" name="color"/>
+                        <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="circle" name="name"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="diameter" name="scale_method"/>
+                        <Option type="QString" value="2" name="size"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="size_unit"/>
+                        <Option type="QString" value="1" name="vertical_anchor_point"/>
                       </Option>
                       <prop k="angle" v="0"/>
                       <prop k="cap_style" v="square"/>
@@ -14640,34 +14642,34 @@ def my_form_open(dialog, layer, feature):
                       <prop k="vertical_anchor_point" v="1"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+                  <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="255,255,255,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0.1" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="255,255,255,255" name="color"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0.1" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="255,255,255,255"/>
@@ -14682,110 +14684,110 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option value="false" type="bool" name="active"/>
-                              <Option value="1" type="int" name="type"/>
-                              <Option value="" type="QString" name="val"/>
+                              <Option type="bool" value="false" name="active"/>
+                              <Option type="int" value="1" name="type"/>
+                              <Option type="QString" value="" name="val"/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format useMaxLineLengthForAutoWrap="1" leftDirectionSymbol="&lt;" wrapChar="" multilineAlign="0" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" decimals="3" rightDirectionSymbol=">" formatNumbers="0"/>
-              <placement overlapHandling="AllowOverlapIfRequired" lineAnchorType="0" centroidInside="0" overrunDistance="0" centroidWhole="0" geometryGeneratorEnabled="0" rotationAngle="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" geometryGeneratorType="PointGeometry" quadOffset="4" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="6" xOffset="0" allowDegraded="1" lineAnchorTextPoint="CenterOfText" layerType="PointGeometry" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" maxCurvedCharAngleOut="-20" repeatDistance="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" dist="1" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" distUnits="MM" lineAnchorClipping="0" placementFlags="10" priority="10" overrunDistanceUnit="MM" maxCurvedCharAngleIn="20" geometryGenerator="" lineAnchorPercent="0.5" yOffset="0" rotationUnit="AngleDegrees"/>
-              <rendering fontMaxPixelSize="10000" drawLabels="1" mergeLines="0" zIndex="2" upsidedownLabels="0" obstacleFactor="1" scaleVisibility="0" limitNumLabels="0" obstacleType="0" fontLimitPixelSize="0" maxNumLabels="2000" minFeatureSize="0" fontMinPixelSize="3" labelPerPart="0" obstacle="0" scaleMax="10000000" scaleMin="1" unplacedVisibility="0"/>
+              <text-format wrapChar="" rightDirectionSymbol=">" plussign="0" leftDirectionSymbol="&lt;" formatNumbers="0" decimals="3" multilineAlign="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
+              <placement offsetUnits="MapUnit" xOffset="0" maxCurvedCharAngleOut="-20" layerType="PointGeometry" allowDegraded="1" yOffset="0" overlapHandling="AllowOverlapIfRequired" geometryGeneratorType="PointGeometry" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" repeatDistanceUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" quadOffset="4" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidWhole="0" overrunDistance="0" overrunDistanceUnit="MM" centroidInside="0" placement="6" geometryGenerator="" priority="10" distUnits="MM" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" dist="1" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorTextPoint="CenterOfText" polygonPlacementFlags="2" rotationUnit="AngleDegrees" offsetType="0" placementFlags="10" repeatDistance="0"/>
+              <rendering limitNumLabels="0" obstacleType="0" obstacle="0" scaleMax="10000000" maxNumLabels="2000" labelPerPart="0" scaleMin="1" upsidedownLabels="0" zIndex="2" unplacedVisibility="0" fontLimitPixelSize="0" minFeatureSize="0" fontMaxPixelSize="10000" scaleVisibility="0" fontMinPixelSize="3" drawLabels="1" mergeLines="0" obstacleFactor="1"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="FontStyle">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="ShapeFillColor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="Size">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+                  <Option type="int" value="0" name="blendMode"/>
                   <Option type="Map" name="ddProperties">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
-                  <Option value="false" type="bool" name="drawToAllParts"/>
-                  <Option value="0" type="QString" name="enabled"/>
-                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                  <Option value="&lt;symbol is_animated=&quot;0&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                  <Option value="0" type="double" name="minLength"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                  <Option value="MM" type="QString" name="minLengthUnit"/>
-                  <Option value="0" type="double" name="offsetFromAnchor"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                  <Option value="0" type="double" name="offsetFromLabel"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                  <Option type="bool" value="false" name="drawToAllParts"/>
+                  <Option type="QString" value="0" name="enabled"/>
+                  <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
+                  <Option type="QString" value="&lt;symbol alpha=&quot;1&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
+                  <Option type="double" value="0" name="minLength"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
+                  <Option type="QString" value="MM" name="minLengthUnit"/>
+                  <Option type="double" value="0" name="offsetFromAnchor"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
+                  <Option type="double" value="0" name="offsetFromLabel"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule active="0" filter="'marshal' = attribute( @atlas_feature , 'type' )" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - disabled due to broken z-index" key="{a55220d0-6cca-4356-8b73-4d8675ee164b}">
+          <rule description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - disabled due to broken z-index" active="0" key="{a55220d0-6cca-4356-8b73-4d8675ee164b}" filter="'marshal' = attribute( @atlas_feature , 'type' )">
             <settings calloutType="simple">
-              <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="63" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="0.5" fieldName="position" useSubstitutions="0" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="6" namedStyle="Semibold" forcedItalic="0" isExpression="0" fontSizeUnit="Point" allowHtml="0" legendString="Aa">
+              <text-style textOpacity="0.5" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="Semibold" fontUnderline="0" fieldName="position" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" useSubstitutions="0" fontWeight="63" fontStrikeout="0" fontItalic="0" fontSize="6" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" isExpression="0" legendString="Aa" textOrientation="horizontal">
                 <families/>
-                <text-buffer bufferNoFill="0" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="0"/>
-                <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0.20000000000000001" shapeFillColor="255,255,255,255" shapeDraw="1" shapeBorderWidth="0.40000000000000002" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0.20000000000000001" shapeType="3" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="0,0,0,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="0.5" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-                  <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+                <text-buffer bufferNoFill="0" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+                <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskType="0"/>
+                <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="0,0,0,255" shapeRotationType="0" shapeSizeX="0.20000000000000001" shapeDraw="1" shapeType="3" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0.40000000000000002" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="0.5" shapeSizeY="0.20000000000000001" shapeRadiiX="0">
+                  <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="255,255,255,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0.4" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="255,255,255,255" name="color"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0.4" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="255,255,255,255"/>
@@ -14800,181 +14802,181 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option value="true" type="bool" name="active"/>
-                              <Option value="if ( @atlas_featureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" type="QString" name="expression"/>
-                              <Option value="3" type="int" name="type"/>
+                              <Option type="bool" value="true" name="active"/>
+                              <Option type="QString" value="if ( @atlas_featureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" name="expression"/>
+                              <Option type="int" value="3" name="type"/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option type="Map" name="properties">
                       <Option type="Map" name="AlwaysShow">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="if ( @atlasfeature_id = $id, 1, 0)" type="QString" name="expression"/>
-                        <Option value="3" type="int" name="type"/>
+                        <Option type="bool" value="true" name="active"/>
+                        <Option type="QString" value="if ( @atlasfeature_id = $id, 1, 0)" name="expression"/>
+                        <Option type="int" value="3" name="type"/>
                       </Option>
                       <Option type="Map" name="FontOpacity">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="100 - (if ( @atlas_featureid = $id, 10, 40))" type="QString" name="expression"/>
-                        <Option value="3" type="int" name="type"/>
+                        <Option type="bool" value="true" name="active"/>
+                        <Option type="QString" value="100 - (if ( @atlas_featureid = $id, 10, 40))" name="expression"/>
+                        <Option type="int" value="3" name="type"/>
                       </Option>
                       <Option type="Map" name="FontStyle">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="if ( @atlas_featureid = $id, 'Semibold', 'Regular' )" type="QString" name="expression"/>
-                        <Option value="3" type="int" name="type"/>
+                        <Option type="bool" value="true" name="active"/>
+                        <Option type="QString" value="if ( @atlas_featureid = $id, 'Semibold', 'Regular' )" name="expression"/>
+                        <Option type="int" value="3" name="type"/>
                       </Option>
                       <Option type="Map" name="ObstacleFactor">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
+                        <Option type="bool" value="false" name="active"/>
+                        <Option type="int" value="1" name="type"/>
+                        <Option type="QString" value="" name="val"/>
                       </Option>
                       <Option type="Map" name="Priority">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="if ( @atlas_featureid = $id, 10.0, 8.0 )" type="QString" name="expression"/>
-                        <Option value="3" type="int" name="type"/>
+                        <Option type="bool" value="true" name="active"/>
+                        <Option type="QString" value="if ( @atlas_featureid = $id, 10.0, 8.0 )" name="expression"/>
+                        <Option type="int" value="3" name="type"/>
                       </Option>
                       <Option type="Map" name="ShapeOpacity">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="100 - (if ( @atlas_featureid = $id, 10, 40))" type="QString" name="expression"/>
-                        <Option value="3" type="int" name="type"/>
+                        <Option type="bool" value="true" name="active"/>
+                        <Option type="QString" value="100 - (if ( @atlas_featureid = $id, 10, 40))" name="expression"/>
+                        <Option type="int" value="3" name="type"/>
                       </Option>
                       <Option type="Map" name="Size">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="if ( @atlas_featureid = $id, 8, 6 )" type="QString" name="expression"/>
-                        <Option value="3" type="int" name="type"/>
+                        <Option type="bool" value="true" name="active"/>
+                        <Option type="QString" value="if ( @atlas_featureid = $id, 8, 6 )" name="expression"/>
+                        <Option type="int" value="3" name="type"/>
                       </Option>
                       <Option type="Map" name="ZIndex">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="if ( @atlasfeature_id = $id, 15, 5 )" type="QString" name="expression"/>
-                        <Option value="3" type="int" name="type"/>
+                        <Option type="bool" value="true" name="active"/>
+                        <Option type="QString" value="if ( @atlasfeature_id = $id, 15, 5 )" name="expression"/>
+                        <Option type="int" value="3" name="type"/>
                       </Option>
                     </Option>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format useMaxLineLengthForAutoWrap="1" leftDirectionSymbol="&lt;" wrapChar="" multilineAlign="1" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" decimals="3" rightDirectionSymbol=">" formatNumbers="0"/>
-              <placement overlapHandling="AllowOverlapIfRequired" lineAnchorType="0" centroidInside="0" overrunDistance="0" centroidWhole="0" geometryGeneratorEnabled="0" rotationAngle="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" geometryGeneratorType="PointGeometry" quadOffset="4" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="6" xOffset="0" allowDegraded="1" lineAnchorTextPoint="CenterOfText" layerType="UnknownGeometry" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" maxCurvedCharAngleOut="-20" repeatDistance="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" dist="0" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" distUnits="MM" lineAnchorClipping="0" placementFlags="10" priority="8" overrunDistanceUnit="MM" maxCurvedCharAngleIn="20" geometryGenerator="" lineAnchorPercent="0.5" yOffset="0" rotationUnit="AngleDegrees"/>
-              <rendering fontMaxPixelSize="10000" drawLabels="1" mergeLines="0" zIndex="5" upsidedownLabels="0" obstacleFactor="1.8" scaleVisibility="0" limitNumLabels="0" obstacleType="0" fontLimitPixelSize="0" maxNumLabels="2000" minFeatureSize="0" fontMinPixelSize="3" labelPerPart="0" obstacle="0" scaleMax="10000000" scaleMin="1" unplacedVisibility="0"/>
+              <text-format wrapChar="" rightDirectionSymbol=">" plussign="0" leftDirectionSymbol="&lt;" formatNumbers="0" decimals="3" multilineAlign="1" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
+              <placement offsetUnits="MapUnit" xOffset="0" maxCurvedCharAngleOut="-20" layerType="UnknownGeometry" allowDegraded="1" yOffset="0" overlapHandling="AllowOverlapIfRequired" geometryGeneratorType="PointGeometry" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" repeatDistanceUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" quadOffset="4" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidWhole="0" overrunDistance="0" overrunDistanceUnit="MM" centroidInside="0" placement="6" geometryGenerator="" priority="8" distUnits="MM" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" dist="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorTextPoint="CenterOfText" polygonPlacementFlags="2" rotationUnit="AngleDegrees" offsetType="0" placementFlags="10" repeatDistance="0"/>
+              <rendering limitNumLabels="0" obstacleType="0" obstacle="0" scaleMax="10000000" maxNumLabels="2000" labelPerPart="0" scaleMin="1" upsidedownLabels="0" zIndex="5" unplacedVisibility="0" fontLimitPixelSize="0" minFeatureSize="0" fontMaxPixelSize="10000" scaleVisibility="0" fontMinPixelSize="3" drawLabels="1" mergeLines="0" obstacleFactor="1.8"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="AlwaysShow">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if ( @atlasfeature_id = $id, 1, 0)" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if ( @atlasfeature_id = $id, 1, 0)" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="FontOpacity">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="100 - (if ( @atlas_featureid = $id, 10, 40))" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="100 - (if ( @atlas_featureid = $id, 10, 40))" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="FontStyle">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if ( @atlas_featureid = $id, 'Semibold', 'Regular' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if ( @atlas_featureid = $id, 'Semibold', 'Regular' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="ObstacleFactor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="Priority">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if ( @atlas_featureid = $id, 10.0, 8.0 )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if ( @atlas_featureid = $id, 10.0, 8.0 )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="ShapeFillColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if ( @atlas_featureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if ( @atlas_featureid = $id, color_rgba( 255, 255, 0, 255 ), color_rgba( 255, 255, 255, 255 ) )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="ShapeOpacity">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="100 - (if ( @atlas_featureid = $id, 10, 40))" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="100 - (if ( @atlas_featureid = $id, 10, 40))" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="Size">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if ( @atlas_featureid = $id, 8, 6 )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if ( @atlas_featureid = $id, 8, 6 )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="ZIndex">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="if ( @atlasfeature_id = $id, 15, 5 )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="if ( @atlasfeature_id = $id, 15, 5 )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+                  <Option type="int" value="0" name="blendMode"/>
                   <Option type="Map" name="ddProperties">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
-                  <Option value="false" type="bool" name="drawToAllParts"/>
-                  <Option value="0" type="QString" name="enabled"/>
-                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                  <Option value="&lt;symbol is_animated=&quot;0&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                  <Option value="0" type="double" name="minLength"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                  <Option value="MM" type="QString" name="minLengthUnit"/>
-                  <Option value="0" type="double" name="offsetFromAnchor"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                  <Option value="0" type="double" name="offsetFromLabel"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                  <Option type="bool" value="false" name="drawToAllParts"/>
+                  <Option type="QString" value="0" name="enabled"/>
+                  <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
+                  <Option type="QString" value="&lt;symbol alpha=&quot;1&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
+                  <Option type="double" value="0" name="minLength"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
+                  <Option type="QString" value="MM" name="minLengthUnit"/>
+                  <Option type="double" value="0" name="offsetFromAnchor"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
+                  <Option type="double" value="0" name="offsetFromLabel"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule active="0" filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid != $id" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show inactive labels below active label" key="{174a53de-c4da-41e6-abf7-f69d60b2cff6}">
+          <rule description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show inactive labels below active label" active="0" key="{174a53de-c4da-41e6-abf7-f69d60b2cff6}" filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid != $id">
             <settings calloutType="simple">
-              <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="50" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="0.59999999999999998" fieldName="position" useSubstitutions="0" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="6" namedStyle="Regular" forcedItalic="0" isExpression="0" fontSizeUnit="Point" allowHtml="0" legendString="Aa">
+              <text-style textOpacity="0.59999999999999998" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="Regular" fontUnderline="0" fieldName="position" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" useSubstitutions="0" fontWeight="50" fontStrikeout="0" fontItalic="0" fontSize="6" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" isExpression="0" legendString="Aa" textOrientation="horizontal">
                 <families/>
-                <text-buffer bufferNoFill="0" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="0"/>
-                <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0.20000000000000001" shapeFillColor="255,255,255,255" shapeDraw="1" shapeBorderWidth="0.40000000000000002" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0.20000000000000001" shapeType="3" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="0,0,0,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="0.59999999999999998" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-                  <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+                <text-buffer bufferNoFill="0" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+                <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskType="0"/>
+                <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="0,0,0,255" shapeRotationType="0" shapeSizeX="0.20000000000000001" shapeDraw="1" shapeType="3" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0.40000000000000002" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="0.59999999999999998" shapeSizeY="0.20000000000000001" shapeRadiiX="0">
+                  <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="255,255,255,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0.4" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="255,255,255,255" name="color"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0.4" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="255,255,255,255"/>
@@ -14989,181 +14991,181 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option value="false" type="bool" name="active"/>
-                              <Option value="1" type="int" name="type"/>
-                              <Option value="" type="QString" name="val"/>
+                              <Option type="bool" value="false" name="active"/>
+                              <Option type="int" value="1" name="type"/>
+                              <Option type="QString" value="" name="val"/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option type="Map" name="properties">
                       <Option type="Map" name="AlwaysShow">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
+                        <Option type="bool" value="false" name="active"/>
+                        <Option type="int" value="1" name="type"/>
+                        <Option type="QString" value="" name="val"/>
                       </Option>
                       <Option type="Map" name="FontOpacity">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
+                        <Option type="bool" value="false" name="active"/>
+                        <Option type="int" value="1" name="type"/>
+                        <Option type="QString" value="" name="val"/>
                       </Option>
                       <Option type="Map" name="FontStyle">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
+                        <Option type="bool" value="false" name="active"/>
+                        <Option type="int" value="1" name="type"/>
+                        <Option type="QString" value="" name="val"/>
                       </Option>
                       <Option type="Map" name="ObstacleFactor">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
+                        <Option type="bool" value="false" name="active"/>
+                        <Option type="int" value="1" name="type"/>
+                        <Option type="QString" value="" name="val"/>
                       </Option>
                       <Option type="Map" name="Priority">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
+                        <Option type="bool" value="false" name="active"/>
+                        <Option type="int" value="1" name="type"/>
+                        <Option type="QString" value="" name="val"/>
                       </Option>
                       <Option type="Map" name="ShapeOpacity">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
+                        <Option type="bool" value="false" name="active"/>
+                        <Option type="int" value="1" name="type"/>
+                        <Option type="QString" value="" name="val"/>
                       </Option>
                       <Option type="Map" name="Size">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
+                        <Option type="bool" value="false" name="active"/>
+                        <Option type="int" value="1" name="type"/>
+                        <Option type="QString" value="" name="val"/>
                       </Option>
                       <Option type="Map" name="ZIndex">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
+                        <Option type="bool" value="false" name="active"/>
+                        <Option type="int" value="1" name="type"/>
+                        <Option type="QString" value="" name="val"/>
                       </Option>
                     </Option>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format useMaxLineLengthForAutoWrap="1" leftDirectionSymbol="&lt;" wrapChar="" multilineAlign="1" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" decimals="3" rightDirectionSymbol=">" formatNumbers="0"/>
-              <placement overlapHandling="AllowOverlapIfRequired" lineAnchorType="0" centroidInside="0" overrunDistance="0" centroidWhole="0" geometryGeneratorEnabled="0" rotationAngle="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" geometryGeneratorType="PointGeometry" quadOffset="4" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="6" xOffset="0" allowDegraded="1" lineAnchorTextPoint="CenterOfText" layerType="UnknownGeometry" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" maxCurvedCharAngleOut="-20" repeatDistance="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" dist="0" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" distUnits="MM" lineAnchorClipping="0" placementFlags="10" priority="8" overrunDistanceUnit="MM" maxCurvedCharAngleIn="20" geometryGenerator="" lineAnchorPercent="0.5" yOffset="0" rotationUnit="AngleDegrees"/>
-              <rendering fontMaxPixelSize="10000" drawLabels="1" mergeLines="0" zIndex="5" upsidedownLabels="0" obstacleFactor="1.8" scaleVisibility="0" limitNumLabels="0" obstacleType="0" fontLimitPixelSize="0" maxNumLabels="2000" minFeatureSize="0" fontMinPixelSize="3" labelPerPart="0" obstacle="0" scaleMax="10000000" scaleMin="1" unplacedVisibility="0"/>
+              <text-format wrapChar="" rightDirectionSymbol=">" plussign="0" leftDirectionSymbol="&lt;" formatNumbers="0" decimals="3" multilineAlign="1" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
+              <placement offsetUnits="MapUnit" xOffset="0" maxCurvedCharAngleOut="-20" layerType="UnknownGeometry" allowDegraded="1" yOffset="0" overlapHandling="AllowOverlapIfRequired" geometryGeneratorType="PointGeometry" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" repeatDistanceUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" quadOffset="4" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidWhole="0" overrunDistance="0" overrunDistanceUnit="MM" centroidInside="0" placement="6" geometryGenerator="" priority="8" distUnits="MM" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" dist="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorTextPoint="CenterOfText" polygonPlacementFlags="2" rotationUnit="AngleDegrees" offsetType="0" placementFlags="10" repeatDistance="0"/>
+              <rendering limitNumLabels="0" obstacleType="0" obstacle="0" scaleMax="10000000" maxNumLabels="2000" labelPerPart="0" scaleMin="1" upsidedownLabels="0" zIndex="5" unplacedVisibility="0" fontLimitPixelSize="0" minFeatureSize="0" fontMaxPixelSize="10000" scaleVisibility="0" fontMinPixelSize="3" drawLabels="1" mergeLines="0" obstacleFactor="1.8"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="AlwaysShow">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="FontOpacity">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="FontStyle">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="ObstacleFactor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="Priority">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="ShapeFillColor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="ShapeOpacity">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="Size">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="ZIndex">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+                  <Option type="int" value="0" name="blendMode"/>
                   <Option type="Map" name="ddProperties">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
-                  <Option value="false" type="bool" name="drawToAllParts"/>
-                  <Option value="0" type="QString" name="enabled"/>
-                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                  <Option value="&lt;symbol is_animated=&quot;0&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                  <Option value="0" type="double" name="minLength"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                  <Option value="MM" type="QString" name="minLengthUnit"/>
-                  <Option value="0" type="double" name="offsetFromAnchor"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                  <Option value="0" type="double" name="offsetFromLabel"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                  <Option type="bool" value="false" name="drawToAllParts"/>
+                  <Option type="QString" value="0" name="enabled"/>
+                  <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
+                  <Option type="QString" value="&lt;symbol alpha=&quot;1&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
+                  <Option type="double" value="0" name="minLength"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
+                  <Option type="QString" value="MM" name="minLengthUnit"/>
+                  <Option type="double" value="0" name="offsetFromAnchor"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
+                  <Option type="double" value="0" name="offsetFromLabel"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule active="0" filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid = $id" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show active layer on top" key="{fc4fc81b-6cf7-433a-b5f5-defae9ee6eb9}">
+          <rule description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show active layer on top" active="0" key="{fc4fc81b-6cf7-433a-b5f5-defae9ee6eb9}" filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid = $id">
             <settings calloutType="simple">
-              <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="63" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="0.90000000000000002" fieldName="position" useSubstitutions="0" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="8" namedStyle="Semibold" forcedItalic="0" isExpression="0" fontSizeUnit="Point" allowHtml="0" legendString="Aa">
+              <text-style textOpacity="0.90000000000000002" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="Semibold" fontUnderline="0" fieldName="position" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" useSubstitutions="0" fontWeight="63" fontStrikeout="0" fontItalic="0" fontSize="8" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" isExpression="0" legendString="Aa" textOrientation="horizontal">
                 <families/>
-                <text-buffer bufferNoFill="0" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="0"/>
-                <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0.20000000000000001" shapeFillColor="255,255,0,255" shapeDraw="1" shapeBorderWidth="0.40000000000000002" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0.20000000000000001" shapeType="3" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="0,0,0,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="0.90000000000000002" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-                  <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+                <text-buffer bufferNoFill="0" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+                <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskType="0"/>
+                <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="0,0,0,255" shapeRotationType="0" shapeSizeX="0.20000000000000001" shapeDraw="1" shapeType="3" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0.40000000000000002" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,0,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="0.90000000000000002" shapeSizeY="0.20000000000000001" shapeRadiiX="0">
+                  <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="255,255,0,255" type="QString" name="color"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0.4" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="255,255,0,255" name="color"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0.4" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="255,255,0,255"/>
@@ -15178,149 +15180,149 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option value="false" type="bool" name="active"/>
-                              <Option value="1" type="int" name="type"/>
-                              <Option value="" type="QString" name="val"/>
+                              <Option type="bool" value="false" name="active"/>
+                              <Option type="int" value="1" name="type"/>
+                              <Option type="QString" value="" name="val"/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option type="Map" name="properties">
                       <Option type="Map" name="AlwaysShow">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
+                        <Option type="bool" value="false" name="active"/>
+                        <Option type="int" value="1" name="type"/>
+                        <Option type="QString" value="" name="val"/>
                       </Option>
                       <Option type="Map" name="FontOpacity">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
+                        <Option type="bool" value="false" name="active"/>
+                        <Option type="int" value="1" name="type"/>
+                        <Option type="QString" value="" name="val"/>
                       </Option>
                       <Option type="Map" name="FontStyle">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
+                        <Option type="bool" value="false" name="active"/>
+                        <Option type="int" value="1" name="type"/>
+                        <Option type="QString" value="" name="val"/>
                       </Option>
                       <Option type="Map" name="ObstacleFactor">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
+                        <Option type="bool" value="false" name="active"/>
+                        <Option type="int" value="1" name="type"/>
+                        <Option type="QString" value="" name="val"/>
                       </Option>
                       <Option type="Map" name="Priority">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
+                        <Option type="bool" value="false" name="active"/>
+                        <Option type="int" value="1" name="type"/>
+                        <Option type="QString" value="" name="val"/>
                       </Option>
                       <Option type="Map" name="ShapeOpacity">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
+                        <Option type="bool" value="false" name="active"/>
+                        <Option type="int" value="1" name="type"/>
+                        <Option type="QString" value="" name="val"/>
                       </Option>
                       <Option type="Map" name="Size">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
+                        <Option type="bool" value="false" name="active"/>
+                        <Option type="int" value="1" name="type"/>
+                        <Option type="QString" value="" name="val"/>
                       </Option>
                       <Option type="Map" name="ZIndex">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
+                        <Option type="bool" value="false" name="active"/>
+                        <Option type="int" value="1" name="type"/>
+                        <Option type="QString" value="" name="val"/>
                       </Option>
                     </Option>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format useMaxLineLengthForAutoWrap="1" leftDirectionSymbol="&lt;" wrapChar="" multilineAlign="1" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" decimals="3" rightDirectionSymbol=">" formatNumbers="0"/>
-              <placement overlapHandling="AllowOverlapIfRequired" lineAnchorType="0" centroidInside="0" overrunDistance="0" centroidWhole="0" geometryGeneratorEnabled="0" rotationAngle="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" geometryGeneratorType="PointGeometry" quadOffset="4" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="0" xOffset="0" allowDegraded="1" lineAnchorTextPoint="CenterOfText" layerType="UnknownGeometry" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" maxCurvedCharAngleOut="-20" repeatDistance="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" dist="0" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" distUnits="MM" lineAnchorClipping="0" placementFlags="10" priority="10" overrunDistanceUnit="MM" maxCurvedCharAngleIn="20" geometryGenerator="" lineAnchorPercent="0.5" yOffset="0" rotationUnit="AngleDegrees"/>
-              <rendering fontMaxPixelSize="10000" drawLabels="1" mergeLines="0" zIndex="10" upsidedownLabels="0" obstacleFactor="1.8" scaleVisibility="0" limitNumLabels="0" obstacleType="0" fontLimitPixelSize="0" maxNumLabels="2000" minFeatureSize="0" fontMinPixelSize="3" labelPerPart="0" obstacle="0" scaleMax="10000000" scaleMin="1" unplacedVisibility="0"/>
+              <text-format wrapChar="" rightDirectionSymbol=">" plussign="0" leftDirectionSymbol="&lt;" formatNumbers="0" decimals="3" multilineAlign="1" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
+              <placement offsetUnits="MapUnit" xOffset="0" maxCurvedCharAngleOut="-20" layerType="UnknownGeometry" allowDegraded="1" yOffset="0" overlapHandling="AllowOverlapIfRequired" geometryGeneratorType="PointGeometry" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" repeatDistanceUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" quadOffset="4" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidWhole="0" overrunDistance="0" overrunDistanceUnit="MM" centroidInside="0" placement="0" geometryGenerator="" priority="10" distUnits="MM" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" dist="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorTextPoint="CenterOfText" polygonPlacementFlags="2" rotationUnit="AngleDegrees" offsetType="0" placementFlags="10" repeatDistance="0"/>
+              <rendering limitNumLabels="0" obstacleType="0" obstacle="0" scaleMax="10000000" maxNumLabels="2000" labelPerPart="0" scaleMin="1" upsidedownLabels="0" zIndex="10" unplacedVisibility="0" fontLimitPixelSize="0" minFeatureSize="0" fontMaxPixelSize="10000" scaleVisibility="0" fontMinPixelSize="3" drawLabels="1" mergeLines="0" obstacleFactor="1.8"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="AlwaysShow">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="FontOpacity">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="FontStyle">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="ObstacleFactor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="Priority">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="ShapeFillColor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="ShapeOpacity">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="Size">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="ZIndex">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+                  <Option type="int" value="0" name="blendMode"/>
                   <Option type="Map" name="ddProperties">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
-                  <Option value="false" type="bool" name="drawToAllParts"/>
-                  <Option value="0" type="QString" name="enabled"/>
-                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                  <Option value="&lt;symbol is_animated=&quot;0&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                  <Option value="0" type="double" name="minLength"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                  <Option value="MM" type="QString" name="minLengthUnit"/>
-                  <Option value="0" type="double" name="offsetFromAnchor"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                  <Option value="0" type="double" name="offsetFromLabel"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                  <Option type="bool" value="false" name="drawToAllParts"/>
+                  <Option type="QString" value="0" name="enabled"/>
+                  <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
+                  <Option type="QString" value="&lt;symbol alpha=&quot;1&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
+                  <Option type="double" value="0" name="minLength"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
+                  <Option type="QString" value="MM" name="minLengthUnit"/>
+                  <Option type="double" value="0" name="offsetFromAnchor"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
+                  <Option type="double" value="0" name="offsetFromLabel"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
@@ -15329,153 +15331,153 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="copy" name="QFieldSync/action"/>
+          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
           <Option type="List" name="dualview/previewExpressions">
-            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
           </Option>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
-          <Option value="false" type="QString" name="labeling/addDirectionSymbol"/>
-          <Option value="0" type="QString" name="labeling/angleOffset"/>
-          <Option value="0" type="QString" name="labeling/blendMode"/>
-          <Option value="0" type="QString" name="labeling/bufferBlendMode"/>
-          <Option value="255" type="QString" name="labeling/bufferColorA"/>
-          <Option value="255" type="QString" name="labeling/bufferColorB"/>
-          <Option value="255" type="QString" name="labeling/bufferColorG"/>
-          <Option value="255" type="QString" name="labeling/bufferColorR"/>
-          <Option value="false" type="QString" name="labeling/bufferDraw"/>
-          <Option value="64" type="QString" name="labeling/bufferJoinStyle"/>
-          <Option value="false" type="QString" name="labeling/bufferNoFill"/>
-          <Option value="1" type="QString" name="labeling/bufferSize"/>
-          <Option value="false" type="QString" name="labeling/bufferSizeInMapUnits"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/bufferSizeMapUnitScale"/>
-          <Option value="0" type="QString" name="labeling/bufferTransp"/>
-          <Option value="false" type="QString" name="labeling/centroidInside"/>
-          <Option value="false" type="QString" name="labeling/centroidWhole"/>
-          <Option value="3" type="QString" name="labeling/decimals"/>
-          <Option value="false" type="QString" name="labeling/displayAll"/>
-          <Option value="0" type="QString" name="labeling/dist"/>
-          <Option value="false" type="QString" name="labeling/distInMapUnits"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/distMapUnitScale"/>
-          <Option value="false" type="QString" name="labeling/drawLabels"/>
-          <Option value="false" type="QString" name="labeling/enabled"/>
-          <Option value="position" type="QString" name="labeling/fieldName"/>
-          <Option value="false" type="QString" name="labeling/fitInPolygonOnly"/>
-          <Option value="0" type="QString" name="labeling/fontCapitals"/>
-          <Option value="Myriad Pro" type="QString" name="labeling/fontFamily"/>
-          <Option value="false" type="QString" name="labeling/fontItalic"/>
-          <Option value="0" type="QString" name="labeling/fontLetterSpacing"/>
-          <Option value="false" type="QString" name="labeling/fontLimitPixelSize"/>
-          <Option value="10000" type="QString" name="labeling/fontMaxPixelSize"/>
-          <Option value="3" type="QString" name="labeling/fontMinPixelSize"/>
-          <Option value="10" type="QString" name="labeling/fontSize"/>
-          <Option value="false" type="QString" name="labeling/fontSizeInMapUnits"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/fontSizeMapUnitScale"/>
-          <Option value="false" type="QString" name="labeling/fontStrikeout"/>
-          <Option value="false" type="QString" name="labeling/fontUnderline"/>
-          <Option value="63" type="QString" name="labeling/fontWeight"/>
-          <Option value="0" type="QString" name="labeling/fontWordSpacing"/>
-          <Option value="false" type="QString" name="labeling/formatNumbers"/>
-          <Option value="false" type="QString" name="labeling/isExpression"/>
-          <Option value="true" type="QString" name="labeling/labelOffsetInMapUnits"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/labelOffsetMapUnitScale"/>
-          <Option value="false" type="QString" name="labeling/labelPerPart"/>
-          <Option value="&lt;" type="QString" name="labeling/leftDirectionSymbol"/>
-          <Option value="false" type="QString" name="labeling/limitNumLabels"/>
-          <Option value="20" type="QString" name="labeling/maxCurvedCharAngleIn"/>
-          <Option value="-20" type="QString" name="labeling/maxCurvedCharAngleOut"/>
-          <Option value="2000" type="QString" name="labeling/maxNumLabels"/>
-          <Option value="false" type="QString" name="labeling/mergeLines"/>
-          <Option value="0" type="QString" name="labeling/minFeatureSize"/>
-          <Option value="0" type="QString" name="labeling/multilineAlign"/>
-          <Option value="1" type="QString" name="labeling/multilineHeight"/>
-          <Option value="Semibold" type="QString" name="labeling/namedStyle"/>
-          <Option value="true" type="QString" name="labeling/obstacle"/>
-          <Option value="1" type="QString" name="labeling/obstacleFactor"/>
-          <Option value="0" type="QString" name="labeling/obstacleType"/>
-          <Option value="0" type="QString" name="labeling/offsetType"/>
-          <Option value="0" type="QString" name="labeling/placeDirectionSymbol"/>
-          <Option value="0" type="QString" name="labeling/placement"/>
-          <Option value="10" type="QString" name="labeling/placementFlags"/>
-          <Option value="false" type="QString" name="labeling/plussign"/>
-          <Option value="TR,TL,BR,BL,R,L,TSR,BSR" type="QString" name="labeling/predefinedPositionOrder"/>
-          <Option value="true" type="QString" name="labeling/preserveRotation"/>
-          <Option value="#ffffff" type="QString" name="labeling/previewBkgrdColor"/>
-          <Option value="5" type="QString" name="labeling/priority"/>
-          <Option value="4" type="QString" name="labeling/quadOffset"/>
-          <Option value="0" type="QString" name="labeling/repeatDistance"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/repeatDistanceMapUnitScale"/>
-          <Option value="1" type="QString" name="labeling/repeatDistanceUnit"/>
-          <Option value="false" type="QString" name="labeling/reverseDirectionSymbol"/>
-          <Option value=">" type="QString" name="labeling/rightDirectionSymbol"/>
-          <Option value="10000000" type="QString" name="labeling/scaleMax"/>
-          <Option value="1" type="QString" name="labeling/scaleMin"/>
-          <Option value="false" type="QString" name="labeling/scaleVisibility"/>
-          <Option value="6" type="QString" name="labeling/shadowBlendMode"/>
-          <Option value="0" type="QString" name="labeling/shadowColorB"/>
-          <Option value="0" type="QString" name="labeling/shadowColorG"/>
-          <Option value="0" type="QString" name="labeling/shadowColorR"/>
-          <Option value="false" type="QString" name="labeling/shadowDraw"/>
-          <Option value="135" type="QString" name="labeling/shadowOffsetAngle"/>
-          <Option value="1" type="QString" name="labeling/shadowOffsetDist"/>
-          <Option value="true" type="QString" name="labeling/shadowOffsetGlobal"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shadowOffsetMapUnitScale"/>
-          <Option value="1" type="QString" name="labeling/shadowOffsetUnits"/>
-          <Option value="1.5" type="QString" name="labeling/shadowRadius"/>
-          <Option value="false" type="QString" name="labeling/shadowRadiusAlphaOnly"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shadowRadiusMapUnitScale"/>
-          <Option value="1" type="QString" name="labeling/shadowRadiusUnits"/>
-          <Option value="100" type="QString" name="labeling/shadowScale"/>
-          <Option value="30" type="QString" name="labeling/shadowTransparency"/>
-          <Option value="0" type="QString" name="labeling/shadowUnder"/>
-          <Option value="0" type="QString" name="labeling/shapeBlendMode"/>
-          <Option value="255" type="QString" name="labeling/shapeBorderColorA"/>
-          <Option value="128" type="QString" name="labeling/shapeBorderColorB"/>
-          <Option value="128" type="QString" name="labeling/shapeBorderColorG"/>
-          <Option value="128" type="QString" name="labeling/shapeBorderColorR"/>
-          <Option value="0" type="QString" name="labeling/shapeBorderWidth"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shapeBorderWidthMapUnitScale"/>
-          <Option value="1" type="QString" name="labeling/shapeBorderWidthUnits"/>
-          <Option value="true" type="QString" name="labeling/shapeDraw"/>
-          <Option value="255" type="QString" name="labeling/shapeFillColorA"/>
-          <Option value="138" type="QString" name="labeling/shapeFillColorB"/>
-          <Option value="0" type="QString" name="labeling/shapeFillColorG"/>
-          <Option value="101" type="QString" name="labeling/shapeFillColorR"/>
-          <Option value="64" type="QString" name="labeling/shapeJoinStyle"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shapeOffsetMapUnitScale"/>
-          <Option value="1" type="QString" name="labeling/shapeOffsetUnits"/>
-          <Option value="0" type="QString" name="labeling/shapeOffsetX"/>
-          <Option value="0" type="QString" name="labeling/shapeOffsetY"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shapeRadiiMapUnitScale"/>
-          <Option value="1" type="QString" name="labeling/shapeRadiiUnits"/>
-          <Option value="0" type="QString" name="labeling/shapeRadiiX"/>
-          <Option value="0" type="QString" name="labeling/shapeRadiiY"/>
-          <Option value="0" type="QString" name="labeling/shapeRotation"/>
-          <Option value="0" type="QString" name="labeling/shapeRotationType"/>
-          <Option value="" type="QString" name="labeling/shapeSVGFile"/>
-          <Option value="0,0,0,0,0,0" type="QString" name="labeling/shapeSizeMapUnitScale"/>
-          <Option value="0" type="QString" name="labeling/shapeSizeType"/>
-          <Option value="1" type="QString" name="labeling/shapeSizeUnits"/>
-          <Option value="0" type="QString" name="labeling/shapeSizeX"/>
-          <Option value="0" type="QString" name="labeling/shapeSizeY"/>
-          <Option value="0" type="QString" name="labeling/shapeTransparency"/>
-          <Option value="0" type="QString" name="labeling/shapeType"/>
-          <Option value="255" type="QString" name="labeling/textColorA"/>
-          <Option value="255" type="QString" name="labeling/textColorB"/>
-          <Option value="255" type="QString" name="labeling/textColorG"/>
-          <Option value="255" type="QString" name="labeling/textColorR"/>
-          <Option value="0" type="QString" name="labeling/textTransp"/>
-          <Option value="0" type="QString" name="labeling/upsidedownLabels"/>
-          <Option value="" type="QString" name="labeling/wrapChar"/>
-          <Option value="0" type="QString" name="labeling/xOffset"/>
-          <Option value="0" type="QString" name="labeling/yOffset"/>
-          <Option value="0" type="QString" name="labeling/zIndex"/>
+          <Option type="QString" value="0" name="embeddedWidgets/count"/>
+          <Option type="QString" value="false" name="labeling/addDirectionSymbol"/>
+          <Option type="QString" value="0" name="labeling/angleOffset"/>
+          <Option type="QString" value="0" name="labeling/blendMode"/>
+          <Option type="QString" value="0" name="labeling/bufferBlendMode"/>
+          <Option type="QString" value="255" name="labeling/bufferColorA"/>
+          <Option type="QString" value="255" name="labeling/bufferColorB"/>
+          <Option type="QString" value="255" name="labeling/bufferColorG"/>
+          <Option type="QString" value="255" name="labeling/bufferColorR"/>
+          <Option type="QString" value="false" name="labeling/bufferDraw"/>
+          <Option type="QString" value="64" name="labeling/bufferJoinStyle"/>
+          <Option type="QString" value="false" name="labeling/bufferNoFill"/>
+          <Option type="QString" value="1" name="labeling/bufferSize"/>
+          <Option type="QString" value="false" name="labeling/bufferSizeInMapUnits"/>
+          <Option type="QString" value="0,0,0,0,0,0" name="labeling/bufferSizeMapUnitScale"/>
+          <Option type="QString" value="0" name="labeling/bufferTransp"/>
+          <Option type="QString" value="false" name="labeling/centroidInside"/>
+          <Option type="QString" value="false" name="labeling/centroidWhole"/>
+          <Option type="QString" value="3" name="labeling/decimals"/>
+          <Option type="QString" value="false" name="labeling/displayAll"/>
+          <Option type="QString" value="0" name="labeling/dist"/>
+          <Option type="QString" value="false" name="labeling/distInMapUnits"/>
+          <Option type="QString" value="0,0,0,0,0,0" name="labeling/distMapUnitScale"/>
+          <Option type="QString" value="false" name="labeling/drawLabels"/>
+          <Option type="QString" value="false" name="labeling/enabled"/>
+          <Option type="QString" value="position" name="labeling/fieldName"/>
+          <Option type="QString" value="false" name="labeling/fitInPolygonOnly"/>
+          <Option type="QString" value="0" name="labeling/fontCapitals"/>
+          <Option type="QString" value="Myriad Pro" name="labeling/fontFamily"/>
+          <Option type="QString" value="false" name="labeling/fontItalic"/>
+          <Option type="QString" value="0" name="labeling/fontLetterSpacing"/>
+          <Option type="QString" value="false" name="labeling/fontLimitPixelSize"/>
+          <Option type="QString" value="10000" name="labeling/fontMaxPixelSize"/>
+          <Option type="QString" value="3" name="labeling/fontMinPixelSize"/>
+          <Option type="QString" value="10" name="labeling/fontSize"/>
+          <Option type="QString" value="false" name="labeling/fontSizeInMapUnits"/>
+          <Option type="QString" value="0,0,0,0,0,0" name="labeling/fontSizeMapUnitScale"/>
+          <Option type="QString" value="false" name="labeling/fontStrikeout"/>
+          <Option type="QString" value="false" name="labeling/fontUnderline"/>
+          <Option type="QString" value="63" name="labeling/fontWeight"/>
+          <Option type="QString" value="0" name="labeling/fontWordSpacing"/>
+          <Option type="QString" value="false" name="labeling/formatNumbers"/>
+          <Option type="QString" value="false" name="labeling/isExpression"/>
+          <Option type="QString" value="true" name="labeling/labelOffsetInMapUnits"/>
+          <Option type="QString" value="0,0,0,0,0,0" name="labeling/labelOffsetMapUnitScale"/>
+          <Option type="QString" value="false" name="labeling/labelPerPart"/>
+          <Option type="QString" value="&lt;" name="labeling/leftDirectionSymbol"/>
+          <Option type="QString" value="false" name="labeling/limitNumLabels"/>
+          <Option type="QString" value="20" name="labeling/maxCurvedCharAngleIn"/>
+          <Option type="QString" value="-20" name="labeling/maxCurvedCharAngleOut"/>
+          <Option type="QString" value="2000" name="labeling/maxNumLabels"/>
+          <Option type="QString" value="false" name="labeling/mergeLines"/>
+          <Option type="QString" value="0" name="labeling/minFeatureSize"/>
+          <Option type="QString" value="0" name="labeling/multilineAlign"/>
+          <Option type="QString" value="1" name="labeling/multilineHeight"/>
+          <Option type="QString" value="Semibold" name="labeling/namedStyle"/>
+          <Option type="QString" value="true" name="labeling/obstacle"/>
+          <Option type="QString" value="1" name="labeling/obstacleFactor"/>
+          <Option type="QString" value="0" name="labeling/obstacleType"/>
+          <Option type="QString" value="0" name="labeling/offsetType"/>
+          <Option type="QString" value="0" name="labeling/placeDirectionSymbol"/>
+          <Option type="QString" value="0" name="labeling/placement"/>
+          <Option type="QString" value="10" name="labeling/placementFlags"/>
+          <Option type="QString" value="false" name="labeling/plussign"/>
+          <Option type="QString" value="TR,TL,BR,BL,R,L,TSR,BSR" name="labeling/predefinedPositionOrder"/>
+          <Option type="QString" value="true" name="labeling/preserveRotation"/>
+          <Option type="QString" value="#ffffff" name="labeling/previewBkgrdColor"/>
+          <Option type="QString" value="5" name="labeling/priority"/>
+          <Option type="QString" value="4" name="labeling/quadOffset"/>
+          <Option type="QString" value="0" name="labeling/repeatDistance"/>
+          <Option type="QString" value="0,0,0,0,0,0" name="labeling/repeatDistanceMapUnitScale"/>
+          <Option type="QString" value="1" name="labeling/repeatDistanceUnit"/>
+          <Option type="QString" value="false" name="labeling/reverseDirectionSymbol"/>
+          <Option type="QString" value=">" name="labeling/rightDirectionSymbol"/>
+          <Option type="QString" value="10000000" name="labeling/scaleMax"/>
+          <Option type="QString" value="1" name="labeling/scaleMin"/>
+          <Option type="QString" value="false" name="labeling/scaleVisibility"/>
+          <Option type="QString" value="6" name="labeling/shadowBlendMode"/>
+          <Option type="QString" value="0" name="labeling/shadowColorB"/>
+          <Option type="QString" value="0" name="labeling/shadowColorG"/>
+          <Option type="QString" value="0" name="labeling/shadowColorR"/>
+          <Option type="QString" value="false" name="labeling/shadowDraw"/>
+          <Option type="QString" value="135" name="labeling/shadowOffsetAngle"/>
+          <Option type="QString" value="1" name="labeling/shadowOffsetDist"/>
+          <Option type="QString" value="true" name="labeling/shadowOffsetGlobal"/>
+          <Option type="QString" value="0,0,0,0,0,0" name="labeling/shadowOffsetMapUnitScale"/>
+          <Option type="QString" value="1" name="labeling/shadowOffsetUnits"/>
+          <Option type="QString" value="1.5" name="labeling/shadowRadius"/>
+          <Option type="QString" value="false" name="labeling/shadowRadiusAlphaOnly"/>
+          <Option type="QString" value="0,0,0,0,0,0" name="labeling/shadowRadiusMapUnitScale"/>
+          <Option type="QString" value="1" name="labeling/shadowRadiusUnits"/>
+          <Option type="QString" value="100" name="labeling/shadowScale"/>
+          <Option type="QString" value="30" name="labeling/shadowTransparency"/>
+          <Option type="QString" value="0" name="labeling/shadowUnder"/>
+          <Option type="QString" value="0" name="labeling/shapeBlendMode"/>
+          <Option type="QString" value="255" name="labeling/shapeBorderColorA"/>
+          <Option type="QString" value="128" name="labeling/shapeBorderColorB"/>
+          <Option type="QString" value="128" name="labeling/shapeBorderColorG"/>
+          <Option type="QString" value="128" name="labeling/shapeBorderColorR"/>
+          <Option type="QString" value="0" name="labeling/shapeBorderWidth"/>
+          <Option type="QString" value="0,0,0,0,0,0" name="labeling/shapeBorderWidthMapUnitScale"/>
+          <Option type="QString" value="1" name="labeling/shapeBorderWidthUnits"/>
+          <Option type="QString" value="true" name="labeling/shapeDraw"/>
+          <Option type="QString" value="255" name="labeling/shapeFillColorA"/>
+          <Option type="QString" value="138" name="labeling/shapeFillColorB"/>
+          <Option type="QString" value="0" name="labeling/shapeFillColorG"/>
+          <Option type="QString" value="101" name="labeling/shapeFillColorR"/>
+          <Option type="QString" value="64" name="labeling/shapeJoinStyle"/>
+          <Option type="QString" value="0,0,0,0,0,0" name="labeling/shapeOffsetMapUnitScale"/>
+          <Option type="QString" value="1" name="labeling/shapeOffsetUnits"/>
+          <Option type="QString" value="0" name="labeling/shapeOffsetX"/>
+          <Option type="QString" value="0" name="labeling/shapeOffsetY"/>
+          <Option type="QString" value="0,0,0,0,0,0" name="labeling/shapeRadiiMapUnitScale"/>
+          <Option type="QString" value="1" name="labeling/shapeRadiiUnits"/>
+          <Option type="QString" value="0" name="labeling/shapeRadiiX"/>
+          <Option type="QString" value="0" name="labeling/shapeRadiiY"/>
+          <Option type="QString" value="0" name="labeling/shapeRotation"/>
+          <Option type="QString" value="0" name="labeling/shapeRotationType"/>
+          <Option type="QString" value="" name="labeling/shapeSVGFile"/>
+          <Option type="QString" value="0,0,0,0,0,0" name="labeling/shapeSizeMapUnitScale"/>
+          <Option type="QString" value="0" name="labeling/shapeSizeType"/>
+          <Option type="QString" value="1" name="labeling/shapeSizeUnits"/>
+          <Option type="QString" value="0" name="labeling/shapeSizeX"/>
+          <Option type="QString" value="0" name="labeling/shapeSizeY"/>
+          <Option type="QString" value="0" name="labeling/shapeTransparency"/>
+          <Option type="QString" value="0" name="labeling/shapeType"/>
+          <Option type="QString" value="255" name="labeling/textColorA"/>
+          <Option type="QString" value="255" name="labeling/textColorB"/>
+          <Option type="QString" value="255" name="labeling/textColorG"/>
+          <Option type="QString" value="255" name="labeling/textColorR"/>
+          <Option type="QString" value="0" name="labeling/textTransp"/>
+          <Option type="QString" value="0" name="labeling/upsidedownLabels"/>
+          <Option type="QString" value="" name="labeling/wrapChar"/>
+          <Option type="QString" value="0" name="labeling/xOffset"/>
+          <Option type="QString" value="0" name="labeling/yOffset"/>
+          <Option type="QString" value="0" name="labeling/zIndex"/>
           <Option type="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -15483,48 +15485,48 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory penAlpha="255" width="15" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" minimumSize="0" enabled="0" maxScaleDenominator="1e+08" diagramOrientation="Up" opacity="1" scaleBasedVisibility="0" spacingUnit="MM" minScaleDenominator="100000" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" lineSizeType="MM" penWidth="0" backgroundAlpha="255" scaleDependency="Area" spacing="0" direction="1" barWidth="5" sizeType="MM" height="15" penColor="#000000" showAxis="0">
-          <fontProperties bold="0" style="" italic="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0"/>
-          <attribute label="" colorOpacity="1" field="" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory height="15" scaleDependency="Area" width="15" lineSizeScale="3x:0,0,0,0,0,0" spacingUnit="MM" lineSizeType="MM" penColor="#000000" spacing="0" labelPlacementMethod="XHeight" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" backgroundAlpha="255" maxScaleDenominator="1e+08" barWidth="5" penWidth="0" minimumSize="0" penAlpha="255" minScaleDenominator="100000" sizeType="MM" backgroundColor="#ffffff" enabled="0" opacity="1" direction="1" scaleBasedVisibility="0" showAxis="0" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270">
+          <fontProperties style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0" strikethrough="0" italic="0" underline="0" bold="0"/>
+          <attribute color="#000000" field="" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="35,35,35,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0.26" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -15555,9 +15557,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -15565,28 +15567,28 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="2" showAll="1" placement="0" zIndex="0" dist="0" priority="0" obstacle="0">
+      <DiagramLayerSettings priority="0" linePlacementFlags="2" obstacle="0" dist="0" zIndex="0" placement="0" showAll="1">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field configurationFlags="None" name="id">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -15595,8 +15597,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="false" type="bool" name="IsMultiline"/>
-                <Option value="false" type="bool" name="UseHtml"/>
+                <Option type="bool" value="false" name="IsMultiline"/>
+                <Option type="bool" value="false" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -15605,8 +15607,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="false" type="bool" name="IsMultiline"/>
-                <Option value="false" type="bool" name="UseHtml"/>
+                <Option type="bool" value="false" name="IsMultiline"/>
+                <Option type="bool" value="false" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -15615,8 +15617,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -15625,8 +15627,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -15649,8 +15651,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -15699,90 +15701,90 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
-        <alias index="1" name="" field="position"/>
-        <alias index="2" name="" field="type"/>
-        <alias index="3" name="" field="notes"/>
-        <alias index="4" name="" field="xyposition"/>
-        <alias index="5" name="" field="day"/>
-        <alias index="6" name="" field="csv_position"/>
-        <alias index="7" name="" field="csv_club"/>
-        <alias index="8" name="" field="csv_firstname"/>
-        <alias index="9" name="" field="csv_surname"/>
-        <alias index="10" name="" field="csv_days"/>
-        <alias index="11" name="" field="csv_first_runner"/>
-        <alias index="12" name="" field="csv_last_runner"/>
-        <alias index="13" name="" field="csv_instructions"/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="position" name=""/>
+        <alias index="2" field="type" name=""/>
+        <alias index="3" field="notes" name=""/>
+        <alias index="4" field="xyposition" name=""/>
+        <alias index="5" field="day" name=""/>
+        <alias index="6" field="csv_position" name=""/>
+        <alias index="7" field="csv_club" name=""/>
+        <alias index="8" field="csv_firstname" name=""/>
+        <alias index="9" field="csv_surname" name=""/>
+        <alias index="10" field="csv_days" name=""/>
+        <alias index="11" field="csv_first_runner" name=""/>
+        <alias index="12" field="csv_last_runner" name=""/>
+        <alias index="13" field="csv_instructions" name=""/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="position"/>
-        <default applyOnUpdate="0" expression="" field="type"/>
-        <default applyOnUpdate="0" expression="" field="notes"/>
-        <default applyOnUpdate="0" expression="" field="xyposition"/>
-        <default applyOnUpdate="0" expression="" field="day"/>
-        <default applyOnUpdate="0" expression="" field="csv_position"/>
-        <default applyOnUpdate="0" expression="" field="csv_club"/>
-        <default applyOnUpdate="0" expression="" field="csv_firstname"/>
-        <default applyOnUpdate="0" expression="" field="csv_surname"/>
-        <default applyOnUpdate="0" expression="" field="csv_days"/>
-        <default applyOnUpdate="0" expression="" field="csv_first_runner"/>
-        <default applyOnUpdate="0" expression="" field="csv_last_runner"/>
-        <default applyOnUpdate="0" expression="" field="csv_instructions"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="position" expression=""/>
+        <default applyOnUpdate="0" field="type" expression=""/>
+        <default applyOnUpdate="0" field="notes" expression=""/>
+        <default applyOnUpdate="0" field="xyposition" expression=""/>
+        <default applyOnUpdate="0" field="day" expression=""/>
+        <default applyOnUpdate="0" field="csv_position" expression=""/>
+        <default applyOnUpdate="0" field="csv_club" expression=""/>
+        <default applyOnUpdate="0" field="csv_firstname" expression=""/>
+        <default applyOnUpdate="0" field="csv_surname" expression=""/>
+        <default applyOnUpdate="0" field="csv_days" expression=""/>
+        <default applyOnUpdate="0" field="csv_first_runner" expression=""/>
+        <default applyOnUpdate="0" field="csv_last_runner" expression=""/>
+        <default applyOnUpdate="0" field="csv_instructions" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="id" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="position" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="type" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="notes" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="xyposition" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="day" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="csv_position" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="csv_club" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="csv_firstname" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="csv_surname" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="csv_days" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="csv_first_runner" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="csv_last_runner" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="csv_instructions" constraints="0"/>
+        <constraint exp_strength="0" field="id" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="position" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="type" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="notes" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="xyposition" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="day" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="csv_position" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="csv_club" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="csv_firstname" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="csv_surname" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="csv_days" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="csv_first_runner" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="csv_last_runner" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="csv_instructions" notnull_strength="0" constraints="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" desc="" field="id"/>
-        <constraint exp="" desc="" field="position"/>
-        <constraint exp="" desc="" field="type"/>
-        <constraint exp="" desc="" field="notes"/>
-        <constraint exp="" desc="" field="xyposition"/>
-        <constraint exp="" desc="" field="day"/>
-        <constraint exp="" desc="" field="csv_position"/>
-        <constraint exp="" desc="" field="csv_club"/>
-        <constraint exp="" desc="" field="csv_firstname"/>
-        <constraint exp="" desc="" field="csv_surname"/>
-        <constraint exp="" desc="" field="csv_days"/>
-        <constraint exp="" desc="" field="csv_first_runner"/>
-        <constraint exp="" desc="" field="csv_last_runner"/>
-        <constraint exp="" desc="" field="csv_instructions"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="position" desc=""/>
+        <constraint exp="" field="type" desc=""/>
+        <constraint exp="" field="notes" desc=""/>
+        <constraint exp="" field="xyposition" desc=""/>
+        <constraint exp="" field="day" desc=""/>
+        <constraint exp="" field="csv_position" desc=""/>
+        <constraint exp="" field="csv_club" desc=""/>
+        <constraint exp="" field="csv_firstname" desc=""/>
+        <constraint exp="" field="csv_surname" desc=""/>
+        <constraint exp="" field="csv_days" desc=""/>
+        <constraint exp="" field="csv_first_runner" desc=""/>
+        <constraint exp="" field="csv_last_runner" desc=""/>
+        <constraint exp="" field="csv_instructions" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="&quot;id&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="&quot;id&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column width="-1" type="field" name="id" hidden="0"/>
+          <column width="-1" type="field" hidden="0" name="id"/>
           <column width="-1" type="actions" hidden="1"/>
-          <column width="-1" type="field" name="position" hidden="0"/>
-          <column width="-1" type="field" name="type" hidden="0"/>
-          <column width="-1" type="field" name="notes" hidden="0"/>
-          <column width="-1" type="field" name="xyposition" hidden="0"/>
-          <column width="-1" type="field" name="csv_club" hidden="0"/>
-          <column width="-1" type="field" name="csv_first_runner" hidden="0"/>
-          <column width="-1" type="field" name="csv_last_runner" hidden="0"/>
-          <column width="-1" type="field" name="csv_firstname" hidden="0"/>
-          <column width="-1" type="field" name="csv_surname" hidden="0"/>
-          <column width="-1" type="field" name="csv_position" hidden="0"/>
-          <column width="-1" type="field" name="csv_days" hidden="0"/>
-          <column width="-1" type="field" name="day" hidden="0"/>
-          <column width="-1" type="field" name="csv_instructions" hidden="0"/>
+          <column width="-1" type="field" hidden="0" name="position"/>
+          <column width="-1" type="field" hidden="0" name="type"/>
+          <column width="-1" type="field" hidden="0" name="notes"/>
+          <column width="-1" type="field" hidden="0" name="xyposition"/>
+          <column width="-1" type="field" hidden="0" name="csv_club"/>
+          <column width="-1" type="field" hidden="0" name="csv_first_runner"/>
+          <column width="-1" type="field" hidden="0" name="csv_last_runner"/>
+          <column width="-1" type="field" hidden="0" name="csv_firstname"/>
+          <column width="-1" type="field" hidden="0" name="csv_surname"/>
+          <column width="-1" type="field" hidden="0" name="csv_position"/>
+          <column width="-1" type="field" hidden="0" name="csv_days"/>
+          <column width="-1" type="field" hidden="0" name="day"/>
+          <column width="-1" type="field" hidden="0" name="csv_instructions"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -15814,99 +15816,99 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="csv_10_distance" editable="0"/>
-        <field name="csv_21_distance" editable="0"/>
-        <field name="csv_Description" editable="0"/>
-        <field name="csv_capt_1" editable="1"/>
-        <field name="csv_captai" editable="1"/>
-        <field name="csv_captain" editable="0"/>
-        <field name="csv_captain_email" editable="0"/>
-        <field name="csv_captain_number" editable="0"/>
-        <field name="csv_captain_phone" editable="0"/>
-        <field name="csv_club" editable="0"/>
-        <field name="csv_days" editable="0"/>
-        <field name="csv_email" editable="0"/>
-        <field name="csv_first runner" editable="0"/>
-        <field name="csv_first_" editable="1"/>
-        <field name="csv_first_runner" editable="0"/>
-        <field name="csv_firstname" editable="0"/>
-        <field name="csv_instru" editable="1"/>
-        <field name="csv_instructions" editable="0"/>
-        <field name="csv_last runner" editable="0"/>
-        <field name="csv_last_r" editable="1"/>
-        <field name="csv_last_runner" editable="0"/>
-        <field name="csv_name" editable="0"/>
-        <field name="csv_phone" editable="0"/>
-        <field name="csv_positi" editable="1"/>
-        <field name="csv_position" editable="0"/>
-        <field name="csv_races" editable="0"/>
-        <field name="csv_surname" editable="0"/>
-        <field name="day" editable="1"/>
-        <field name="id" editable="1"/>
-        <field name="notes" editable="1"/>
-        <field name="oldpositio" editable="1"/>
-        <field name="position" editable="1"/>
-        <field name="type" editable="1"/>
-        <field name="xyposition" editable="1"/>
+        <field editable="0" name="csv_10_distance"/>
+        <field editable="0" name="csv_21_distance"/>
+        <field editable="0" name="csv_Description"/>
+        <field editable="1" name="csv_capt_1"/>
+        <field editable="1" name="csv_captai"/>
+        <field editable="0" name="csv_captain"/>
+        <field editable="0" name="csv_captain_email"/>
+        <field editable="0" name="csv_captain_number"/>
+        <field editable="0" name="csv_captain_phone"/>
+        <field editable="0" name="csv_club"/>
+        <field editable="0" name="csv_days"/>
+        <field editable="0" name="csv_email"/>
+        <field editable="0" name="csv_first runner"/>
+        <field editable="1" name="csv_first_"/>
+        <field editable="0" name="csv_first_runner"/>
+        <field editable="0" name="csv_firstname"/>
+        <field editable="1" name="csv_instru"/>
+        <field editable="0" name="csv_instructions"/>
+        <field editable="0" name="csv_last runner"/>
+        <field editable="1" name="csv_last_r"/>
+        <field editable="0" name="csv_last_runner"/>
+        <field editable="0" name="csv_name"/>
+        <field editable="0" name="csv_phone"/>
+        <field editable="1" name="csv_positi"/>
+        <field editable="0" name="csv_position"/>
+        <field editable="0" name="csv_races"/>
+        <field editable="0" name="csv_surname"/>
+        <field editable="1" name="day"/>
+        <field editable="1" name="id"/>
+        <field editable="1" name="notes"/>
+        <field editable="1" name="oldpositio"/>
+        <field editable="1" name="position"/>
+        <field editable="1" name="type"/>
+        <field editable="1" name="xyposition"/>
       </editable>
       <labelOnTop>
-        <field name="csv_10_distance" labelOnTop="0"/>
-        <field name="csv_21_distance" labelOnTop="0"/>
-        <field name="csv_Description" labelOnTop="0"/>
-        <field name="csv_capt_1" labelOnTop="0"/>
-        <field name="csv_captai" labelOnTop="0"/>
-        <field name="csv_captain" labelOnTop="0"/>
-        <field name="csv_captain_email" labelOnTop="0"/>
-        <field name="csv_captain_number" labelOnTop="0"/>
-        <field name="csv_captain_phone" labelOnTop="0"/>
-        <field name="csv_club" labelOnTop="0"/>
-        <field name="csv_days" labelOnTop="0"/>
-        <field name="csv_email" labelOnTop="0"/>
-        <field name="csv_first runner" labelOnTop="0"/>
-        <field name="csv_first_" labelOnTop="0"/>
-        <field name="csv_first_runner" labelOnTop="0"/>
-        <field name="csv_firstname" labelOnTop="0"/>
-        <field name="csv_instru" labelOnTop="0"/>
-        <field name="csv_instructions" labelOnTop="0"/>
-        <field name="csv_last runner" labelOnTop="0"/>
-        <field name="csv_last_r" labelOnTop="0"/>
-        <field name="csv_last_runner" labelOnTop="0"/>
-        <field name="csv_name" labelOnTop="0"/>
-        <field name="csv_phone" labelOnTop="0"/>
-        <field name="csv_positi" labelOnTop="0"/>
-        <field name="csv_position" labelOnTop="0"/>
-        <field name="csv_races" labelOnTop="0"/>
-        <field name="csv_surname" labelOnTop="0"/>
-        <field name="day" labelOnTop="0"/>
-        <field name="id" labelOnTop="0"/>
-        <field name="notes" labelOnTop="0"/>
-        <field name="oldpositio" labelOnTop="0"/>
-        <field name="position" labelOnTop="0"/>
-        <field name="type" labelOnTop="0"/>
-        <field name="xyposition" labelOnTop="0"/>
+        <field labelOnTop="0" name="csv_10_distance"/>
+        <field labelOnTop="0" name="csv_21_distance"/>
+        <field labelOnTop="0" name="csv_Description"/>
+        <field labelOnTop="0" name="csv_capt_1"/>
+        <field labelOnTop="0" name="csv_captai"/>
+        <field labelOnTop="0" name="csv_captain"/>
+        <field labelOnTop="0" name="csv_captain_email"/>
+        <field labelOnTop="0" name="csv_captain_number"/>
+        <field labelOnTop="0" name="csv_captain_phone"/>
+        <field labelOnTop="0" name="csv_club"/>
+        <field labelOnTop="0" name="csv_days"/>
+        <field labelOnTop="0" name="csv_email"/>
+        <field labelOnTop="0" name="csv_first runner"/>
+        <field labelOnTop="0" name="csv_first_"/>
+        <field labelOnTop="0" name="csv_first_runner"/>
+        <field labelOnTop="0" name="csv_firstname"/>
+        <field labelOnTop="0" name="csv_instru"/>
+        <field labelOnTop="0" name="csv_instructions"/>
+        <field labelOnTop="0" name="csv_last runner"/>
+        <field labelOnTop="0" name="csv_last_r"/>
+        <field labelOnTop="0" name="csv_last_runner"/>
+        <field labelOnTop="0" name="csv_name"/>
+        <field labelOnTop="0" name="csv_phone"/>
+        <field labelOnTop="0" name="csv_positi"/>
+        <field labelOnTop="0" name="csv_position"/>
+        <field labelOnTop="0" name="csv_races"/>
+        <field labelOnTop="0" name="csv_surname"/>
+        <field labelOnTop="0" name="day"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="notes"/>
+        <field labelOnTop="0" name="oldpositio"/>
+        <field labelOnTop="0" name="position"/>
+        <field labelOnTop="0" name="type"/>
+        <field labelOnTop="0" name="xyposition"/>
       </labelOnTop>
       <reuseLastValue>
-        <field name="csv_captain" reuseLastValue="0"/>
-        <field name="csv_captain_email" reuseLastValue="0"/>
-        <field name="csv_captain_phone" reuseLastValue="0"/>
-        <field name="csv_club" reuseLastValue="0"/>
-        <field name="csv_days" reuseLastValue="0"/>
-        <field name="csv_email" reuseLastValue="0"/>
-        <field name="csv_first_runner" reuseLastValue="0"/>
-        <field name="csv_firstname" reuseLastValue="0"/>
-        <field name="csv_instructions" reuseLastValue="0"/>
-        <field name="csv_last_runner" reuseLastValue="0"/>
-        <field name="csv_name" reuseLastValue="0"/>
-        <field name="csv_phone" reuseLastValue="0"/>
-        <field name="csv_position" reuseLastValue="0"/>
-        <field name="csv_races" reuseLastValue="0"/>
-        <field name="csv_surname" reuseLastValue="0"/>
-        <field name="day" reuseLastValue="0"/>
-        <field name="id" reuseLastValue="0"/>
-        <field name="notes" reuseLastValue="0"/>
-        <field name="position" reuseLastValue="0"/>
-        <field name="type" reuseLastValue="0"/>
-        <field name="xyposition" reuseLastValue="0"/>
+        <field reuseLastValue="0" name="csv_captain"/>
+        <field reuseLastValue="0" name="csv_captain_email"/>
+        <field reuseLastValue="0" name="csv_captain_phone"/>
+        <field reuseLastValue="0" name="csv_club"/>
+        <field reuseLastValue="0" name="csv_days"/>
+        <field reuseLastValue="0" name="csv_email"/>
+        <field reuseLastValue="0" name="csv_first_runner"/>
+        <field reuseLastValue="0" name="csv_firstname"/>
+        <field reuseLastValue="0" name="csv_instructions"/>
+        <field reuseLastValue="0" name="csv_last_runner"/>
+        <field reuseLastValue="0" name="csv_name"/>
+        <field reuseLastValue="0" name="csv_phone"/>
+        <field reuseLastValue="0" name="csv_position"/>
+        <field reuseLastValue="0" name="csv_races"/>
+        <field reuseLastValue="0" name="csv_surname"/>
+        <field reuseLastValue="0" name="day"/>
+        <field reuseLastValue="0" name="id"/>
+        <field reuseLastValue="0" name="notes"/>
+        <field reuseLastValue="0" name="position"/>
+        <field reuseLastValue="0" name="type"/>
+        <field reuseLastValue="0" name="xyposition"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets>
@@ -15956,7 +15958,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip>name</mapTip>
     </maplayer>
-    <maplayer minScale="1e+08" refreshOnNotifyEnabled="0" autoRefreshTime="0" maxScale="100000" type="vector" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" geometry="No geometry" autoRefreshEnabled="0" legendPlaceholderImage="" wkbType="NoGeometry" readOnly="0" refreshOnNotifyMessage="">
+    <maplayer refreshOnNotifyEnabled="0" refreshOnNotifyMessage="" minScale="1e+08" hasScaleBasedVisibilityFlag="0" type="vector" wkbType="NoGeometry" maxScale="100000" readOnly="0" legendPlaceholderImage="" styleCategories="AllStyleCategories" autoRefreshTime="0" geometry="No geometry" autoRefreshEnabled="0">
       <id>marshals_by_position20161003112326575</id>
       <datasource>file:./marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes</datasource>
       <keywordList>
@@ -16009,7 +16011,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxy="0" minz="0" dimensions="2" maxx="0" maxz="0" miny="0" minx="0" crs=""/>
+          <spatial maxz="0" minx="0" maxx="0" minz="0" crs="" miny="0" maxy="0" dimensions="2"/>
           <temporal>
             <period>
               <start></start>
@@ -16037,58 +16039,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" startExpression="" mode="0" limitMode="0" endField="" fixedDuration="0" accumulate="0" durationUnit="min" startField="" endExpression="" enabled="0">
+      <temporal durationField="" fixedDuration="0" accumulate="0" endField="" startField="" enabled="0" startExpression="" endExpression="" durationUnit="min" mode="0" limitMode="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" zscale="1" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" binding="Centroid" type="IndividualFeatures" symbology="Line" extrusion="0" zoffset="0">
+      <elevation extrusionEnabled="0" symbology="Line" type="IndividualFeatures" zscale="1" clamping="Terrain" showMarkerSymbolInSurfacePlots="0" zoffset="0" extrusion="0" respectLayerSymbol="1" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="243,166,178,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="243,166,178,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -16119,36 +16121,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="243,166,178,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="174,119,127,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="243,166,178,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="174,119,127,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="243,166,178,255"/>
@@ -16163,44 +16165,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="243,166,178,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="174,119,127,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="243,166,178,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="diamond" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="174,119,127,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="3" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -16223,9 +16225,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -16234,28 +16236,28 @@ def my_form_open(dialog, layer, feature):
       </elevation>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option value="first_name" type="QString" name="dualview/previewExpressions"/>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="QString" value="copy" name="QFieldSync/action"/>
+          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="first_name" name="dualview/previewExpressions"/>
+          <Option type="QString" value="0" name="embeddedWidgets/count"/>
           <Option type="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
       </customproperties>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field configurationFlags="None" name="position">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -16264,8 +16266,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -16288,8 +16290,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -16298,8 +16300,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -16308,8 +16310,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -16318,8 +16320,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -16349,8 +16351,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -16378,94 +16380,94 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="position"/>
-        <alias index="1" name="" field="club"/>
-        <alias index="2" name="" field="firstname"/>
-        <alias index="3" name="" field="surname"/>
-        <alias index="4" name="" field="name"/>
-        <alias index="5" name="" field="phone"/>
-        <alias index="6" name="" field="email"/>
-        <alias index="7" name="" field="captain"/>
-        <alias index="8" name="" field="captain_phone"/>
-        <alias index="9" name="" field="captain_email"/>
-        <alias index="10" name="" field="days"/>
-        <alias index="11" name="" field="races"/>
-        <alias index="12" name="" field="first_runner"/>
-        <alias index="13" name="" field="last_runner"/>
-        <alias index="14" name="" field="instructions"/>
+        <alias index="0" field="position" name=""/>
+        <alias index="1" field="club" name=""/>
+        <alias index="2" field="firstname" name=""/>
+        <alias index="3" field="surname" name=""/>
+        <alias index="4" field="name" name=""/>
+        <alias index="5" field="phone" name=""/>
+        <alias index="6" field="email" name=""/>
+        <alias index="7" field="captain" name=""/>
+        <alias index="8" field="captain_phone" name=""/>
+        <alias index="9" field="captain_email" name=""/>
+        <alias index="10" field="days" name=""/>
+        <alias index="11" field="races" name=""/>
+        <alias index="12" field="first_runner" name=""/>
+        <alias index="13" field="last_runner" name=""/>
+        <alias index="14" field="instructions" name=""/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="position"/>
-        <default applyOnUpdate="0" expression="" field="club"/>
-        <default applyOnUpdate="0" expression="" field="firstname"/>
-        <default applyOnUpdate="0" expression="" field="surname"/>
-        <default applyOnUpdate="0" expression="" field="name"/>
-        <default applyOnUpdate="0" expression="" field="phone"/>
-        <default applyOnUpdate="0" expression="" field="email"/>
-        <default applyOnUpdate="0" expression="" field="captain"/>
-        <default applyOnUpdate="0" expression="" field="captain_phone"/>
-        <default applyOnUpdate="0" expression="" field="captain_email"/>
-        <default applyOnUpdate="0" expression="" field="days"/>
-        <default applyOnUpdate="0" expression="" field="races"/>
-        <default applyOnUpdate="0" expression="" field="first_runner"/>
-        <default applyOnUpdate="0" expression="" field="last_runner"/>
-        <default applyOnUpdate="0" expression="" field="instructions"/>
+        <default applyOnUpdate="0" field="position" expression=""/>
+        <default applyOnUpdate="0" field="club" expression=""/>
+        <default applyOnUpdate="0" field="firstname" expression=""/>
+        <default applyOnUpdate="0" field="surname" expression=""/>
+        <default applyOnUpdate="0" field="name" expression=""/>
+        <default applyOnUpdate="0" field="phone" expression=""/>
+        <default applyOnUpdate="0" field="email" expression=""/>
+        <default applyOnUpdate="0" field="captain" expression=""/>
+        <default applyOnUpdate="0" field="captain_phone" expression=""/>
+        <default applyOnUpdate="0" field="captain_email" expression=""/>
+        <default applyOnUpdate="0" field="days" expression=""/>
+        <default applyOnUpdate="0" field="races" expression=""/>
+        <default applyOnUpdate="0" field="first_runner" expression=""/>
+        <default applyOnUpdate="0" field="last_runner" expression=""/>
+        <default applyOnUpdate="0" field="instructions" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="position" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="club" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="firstname" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="surname" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="name" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="phone" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="email" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="captain" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="captain_phone" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="captain_email" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="days" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="races" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="first_runner" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="last_runner" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="instructions" constraints="0"/>
+        <constraint exp_strength="0" field="position" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="club" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="firstname" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="surname" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="name" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="phone" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="email" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="captain" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="captain_phone" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="captain_email" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="days" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="races" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="first_runner" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="last_runner" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="instructions" notnull_strength="0" constraints="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" desc="" field="position"/>
-        <constraint exp="" desc="" field="club"/>
-        <constraint exp="" desc="" field="firstname"/>
-        <constraint exp="" desc="" field="surname"/>
-        <constraint exp="" desc="" field="name"/>
-        <constraint exp="" desc="" field="phone"/>
-        <constraint exp="" desc="" field="email"/>
-        <constraint exp="" desc="" field="captain"/>
-        <constraint exp="" desc="" field="captain_phone"/>
-        <constraint exp="" desc="" field="captain_email"/>
-        <constraint exp="" desc="" field="days"/>
-        <constraint exp="" desc="" field="races"/>
-        <constraint exp="" desc="" field="first_runner"/>
-        <constraint exp="" desc="" field="last_runner"/>
-        <constraint exp="" desc="" field="instructions"/>
+        <constraint exp="" field="position" desc=""/>
+        <constraint exp="" field="club" desc=""/>
+        <constraint exp="" field="firstname" desc=""/>
+        <constraint exp="" field="surname" desc=""/>
+        <constraint exp="" field="name" desc=""/>
+        <constraint exp="" field="phone" desc=""/>
+        <constraint exp="" field="email" desc=""/>
+        <constraint exp="" field="captain" desc=""/>
+        <constraint exp="" field="captain_phone" desc=""/>
+        <constraint exp="" field="captain_email" desc=""/>
+        <constraint exp="" field="days" desc=""/>
+        <constraint exp="" field="races" desc=""/>
+        <constraint exp="" field="first_runner" desc=""/>
+        <constraint exp="" field="last_runner" desc=""/>
+        <constraint exp="" field="instructions" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column width="-1" type="field" name="position" hidden="0"/>
-          <column width="221" type="field" name="name" hidden="0"/>
-          <column width="-1" type="field" name="club" hidden="0"/>
-          <column width="-1" type="field" name="phone" hidden="0"/>
-          <column width="-1" type="field" name="email" hidden="0"/>
-          <column width="-1" type="field" name="captain" hidden="0"/>
-          <column width="-1" type="field" name="races" hidden="0"/>
+          <column width="-1" type="field" hidden="0" name="position"/>
+          <column width="221" type="field" hidden="0" name="name"/>
+          <column width="-1" type="field" hidden="0" name="club"/>
+          <column width="-1" type="field" hidden="0" name="phone"/>
+          <column width="-1" type="field" hidden="0" name="email"/>
+          <column width="-1" type="field" hidden="0" name="captain"/>
+          <column width="-1" type="field" hidden="0" name="races"/>
           <column width="-1" type="actions" hidden="1"/>
-          <column width="-1" type="field" name="first_runner" hidden="0"/>
-          <column width="-1" type="field" name="last_runner" hidden="0"/>
-          <column width="-1" type="field" name="instructions" hidden="0"/>
-          <column width="-1" type="field" name="firstname" hidden="0"/>
-          <column width="-1" type="field" name="surname" hidden="0"/>
-          <column width="-1" type="field" name="captain_phone" hidden="0"/>
-          <column width="-1" type="field" name="captain_email" hidden="0"/>
+          <column width="-1" type="field" hidden="0" name="first_runner"/>
+          <column width="-1" type="field" hidden="0" name="last_runner"/>
+          <column width="-1" type="field" hidden="0" name="instructions"/>
+          <column width="-1" type="field" hidden="0" name="firstname"/>
+          <column width="-1" type="field" hidden="0" name="surname"/>
+          <column width="-1" type="field" hidden="0" name="captain_phone"/>
+          <column width="-1" type="field" hidden="0" name="captain_email"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -16497,42 +16499,42 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="10_distance" editable="1"/>
-        <field name="21_distance" editable="1"/>
-        <field name="5_distance" editable="1"/>
-        <field name="captain" editable="1"/>
-        <field name="captain_number" editable="1"/>
-        <field name="club" editable="1"/>
-        <field name="email" editable="1"/>
-        <field name="first_name" editable="1"/>
-        <field name="first_runner" editable="1"/>
-        <field name="instructions" editable="1"/>
-        <field name="last_name" editable="1"/>
-        <field name="last_runner" editable="1"/>
-        <field name="name" editable="1"/>
-        <field name="phone" editable="1"/>
-        <field name="position" editable="1"/>
-        <field name="races" editable="1"/>
-        <field name="tshirt" editable="1"/>
+        <field editable="1" name="10_distance"/>
+        <field editable="1" name="21_distance"/>
+        <field editable="1" name="5_distance"/>
+        <field editable="1" name="captain"/>
+        <field editable="1" name="captain_number"/>
+        <field editable="1" name="club"/>
+        <field editable="1" name="email"/>
+        <field editable="1" name="first_name"/>
+        <field editable="1" name="first_runner"/>
+        <field editable="1" name="instructions"/>
+        <field editable="1" name="last_name"/>
+        <field editable="1" name="last_runner"/>
+        <field editable="1" name="name"/>
+        <field editable="1" name="phone"/>
+        <field editable="1" name="position"/>
+        <field editable="1" name="races"/>
+        <field editable="1" name="tshirt"/>
       </editable>
       <labelOnTop>
-        <field name="10_distance" labelOnTop="0"/>
-        <field name="21_distance" labelOnTop="0"/>
-        <field name="5_distance" labelOnTop="0"/>
-        <field name="captain" labelOnTop="0"/>
-        <field name="captain_number" labelOnTop="0"/>
-        <field name="club" labelOnTop="0"/>
-        <field name="email" labelOnTop="0"/>
-        <field name="first_name" labelOnTop="0"/>
-        <field name="first_runner" labelOnTop="0"/>
-        <field name="instructions" labelOnTop="0"/>
-        <field name="last_name" labelOnTop="0"/>
-        <field name="last_runner" labelOnTop="0"/>
-        <field name="name" labelOnTop="0"/>
-        <field name="phone" labelOnTop="0"/>
-        <field name="position" labelOnTop="0"/>
-        <field name="races" labelOnTop="0"/>
-        <field name="tshirt" labelOnTop="0"/>
+        <field labelOnTop="0" name="10_distance"/>
+        <field labelOnTop="0" name="21_distance"/>
+        <field labelOnTop="0" name="5_distance"/>
+        <field labelOnTop="0" name="captain"/>
+        <field labelOnTop="0" name="captain_number"/>
+        <field labelOnTop="0" name="club"/>
+        <field labelOnTop="0" name="email"/>
+        <field labelOnTop="0" name="first_name"/>
+        <field labelOnTop="0" name="first_runner"/>
+        <field labelOnTop="0" name="instructions"/>
+        <field labelOnTop="0" name="last_name"/>
+        <field labelOnTop="0" name="last_runner"/>
+        <field labelOnTop="0" name="name"/>
+        <field labelOnTop="0" name="phone"/>
+        <field labelOnTop="0" name="position"/>
+        <field labelOnTop="0" name="races"/>
+        <field labelOnTop="0" name="tshirt"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -16540,7 +16542,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>first_name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" simplifyLocal="1" autoRefreshTime="0" wkbType="MultiLineString" simplifyDrawingHints="1" type="vector" symbologyReferenceScale="-1" minScale="100000000" legendPlaceholderImage="" refreshOnNotifyEnabled="0" labelsEnabled="0" maxScale="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" refreshOnNotifyMessage="" readOnly="0" geometry="Line" autoRefreshEnabled="0" simplifyDrawingTol="1">
+    <maplayer simplifyLocal="1" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1" legendPlaceholderImage="" symbologyReferenceScale="-1" readOnly="0" refreshOnNotifyEnabled="0" minScale="100000000" maxScale="0" type="vector" autoRefreshTime="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="0" styleCategories="AllStyleCategories" geometry="Line" autoRefreshEnabled="0" wkbType="MultiLineString">
       <extent>
         <xmin>18.41055689999999956</xmin>
         <ymin>-33.9145735999999971</ymin>
@@ -16605,7 +16607,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxy="0" minz="0" dimensions="2" maxx="0" maxz="0" miny="0" minx="0" crs=""/>
+          <spatial maxz="0" minx="0" maxx="0" minz="0" crs="" miny="0" maxy="0" dimensions="2"/>
           <temporal>
             <period>
               <start></start>
@@ -16630,58 +16632,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" startExpression="" mode="0" limitMode="0" endField="" fixedDuration="0" accumulate="0" durationUnit="min" startField="" endExpression="" enabled="0">
+      <temporal durationField="" fixedDuration="0" accumulate="0" endField="" startField="" enabled="0" startExpression="" endExpression="" durationUnit="min" mode="0" limitMode="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" zscale="1" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" binding="Centroid" type="IndividualFeatures" symbology="Line" extrusion="0" zoffset="0">
+      <elevation extrusionEnabled="0" symbology="Line" type="IndividualFeatures" zscale="1" clamping="Terrain" showMarkerSymbolInSurfacePlots="0" zoffset="0" extrusion="0" respectLayerSymbol="1" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="141,90,153,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="141,90,153,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -16712,36 +16714,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="141,90,153,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="101,64,109,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="141,90,153,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="101,64,109,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="141,90,153,255"/>
@@ -16756,44 +16758,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="141,90,153,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="101,64,109,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="141,90,153,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="diamond" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="101,64,109,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="3" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -16816,58 +16818,58 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" type="RuleRenderer" symbollevels="0" referencescale="-1" enableorderby="0">
+      <renderer-v2 enableorderby="0" type="RuleRenderer" symbollevels="0" referencescale="-1" forceraster="0">
         <rules key="{5bddb61b-4527-4f61-bf00-ae5121d1f9fd}">
-          <rule filter="&quot;type&quot; IS 'car'" symbol="0" label="Car" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}"/>
-          <rule filter="&quot;type&quot; IS 'walk'" symbol="1" label="Walking" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}"/>
+          <rule symbol="0" label="Car" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}" filter="&quot;type&quot; IS 'car'"/>
+          <rule symbol="1" label="Walking" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}" filter="&quot;type&quot; IS 'walk'"/>
         </rules>
         <symbols>
-          <symbol is_animated="0" type="line" name="0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="123,211,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="1" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="123,211,0,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="1" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -16898,50 +16900,50 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" type="line" name="1" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="flat" type="QString" name="capstyle"/>
-                <Option value="4;1;1;1" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="103,34,144,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="1.25" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="1" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="flat" name="capstyle"/>
+                <Option type="QString" value="4;1;1;1" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="103,34,144,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="1.25" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="1" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="flat"/>
@@ -16972,30 +16974,30 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="LastVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="3" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="LastVertex" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -17015,33 +17017,33 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" type="marker" name="@1@1" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+              <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@1@1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer locked="0" class="FilledMarker" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="103,34,144,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="5" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="103,34,144,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="filled_arrowhead" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="5" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="103,34,144,255"/>
@@ -17057,32 +17059,32 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol is_animated="0" type="fill" name="@@1@1@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+                  <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@@1@1@0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="103,34,144,255" type="QString" name="color"/>
-                        <Option value="miter" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                        <Option value="no" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="103,34,144,255" name="color"/>
+                        <Option type="QString" value="miter" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                        <Option type="QString" value="no" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="103,34,144,255"/>
@@ -17097,9 +17099,9 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -17112,11 +17114,11 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option value="id" type="QString" name="dualview/previewExpressions"/>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="QString" value="copy" name="QFieldSync/action"/>
+          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="id" name="dualview/previewExpressions"/>
+          <Option type="QString" value="0" name="embeddedWidgets/count"/>
           <Option type="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -17124,48 +17126,48 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory penAlpha="255" width="15" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" minimumSize="0" enabled="0" maxScaleDenominator="1e+08" diagramOrientation="Up" opacity="1" scaleBasedVisibility="0" spacingUnit="MM" minScaleDenominator="0" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" lineSizeType="MM" penWidth="0" backgroundAlpha="255" scaleDependency="Area" spacing="0" direction="1" barWidth="5" sizeType="MM" height="15" penColor="#000000" showAxis="0">
-          <fontProperties bold="0" style="0" italic="1" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" strikethrough="0"/>
-          <attribute label="" colorOpacity="1" field="" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory height="15" scaleDependency="Area" width="15" lineSizeScale="3x:0,0,0,0,0,0" spacingUnit="MM" lineSizeType="MM" penColor="#000000" spacing="0" labelPlacementMethod="XHeight" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" backgroundAlpha="255" maxScaleDenominator="1e+08" barWidth="5" penWidth="0" minimumSize="0" penAlpha="255" minScaleDenominator="0" sizeType="MM" backgroundColor="#ffffff" enabled="0" opacity="1" direction="1" scaleBasedVisibility="0" showAxis="0" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270">
+          <fontProperties style="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" strikethrough="0" italic="1" underline="0" bold="0"/>
+          <attribute color="#000000" field="" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="35,35,35,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0.26" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -17196,9 +17198,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -17206,20 +17208,20 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" showAll="1" placement="2" zIndex="0" dist="0" priority="0" obstacle="0">
+      <DiagramLayerSettings priority="0" linePlacementFlags="18" obstacle="0" dist="0" zIndex="0" placement="2" showAll="1">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field configurationFlags="None" name="id">
@@ -17238,30 +17240,30 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
-        <alias index="1" name="" field="type"/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="type" name=""/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="type"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="type" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="id" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="type" constraints="0"/>
+        <constraint exp_strength="0" field="id" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="type" notnull_strength="0" constraints="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" desc="" field="id"/>
-        <constraint exp="" desc="" field="type"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="type" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column width="-1" type="field" name="id" hidden="0"/>
+          <column width="-1" type="field" hidden="0" name="id"/>
           <column width="-1" type="actions" hidden="1"/>
-          <column width="-1" type="field" name="type" hidden="0"/>
+          <column width="-1" type="field" hidden="0" name="type"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -17293,12 +17295,12 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="id" editable="1"/>
-        <field name="type" editable="1"/>
+        <field editable="1" name="id"/>
+        <field editable="1" name="type"/>
       </editable>
       <labelOnTop>
-        <field name="id" labelOnTop="0"/>
-        <field name="type" labelOnTop="0"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="type"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -17306,7 +17308,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" simplifyLocal="1" autoRefreshTime="0" wkbType="Point" simplifyDrawingHints="0" type="vector" symbologyReferenceScale="-1" minScale="100000000" legendPlaceholderImage="" refreshOnNotifyEnabled="0" labelsEnabled="1" maxScale="100000" styleCategories="AllStyleCategories" simplifyAlgorithm="0" refreshOnNotifyMessage="" readOnly="0" geometry="Point" autoRefreshEnabled="0" simplifyDrawingTol="1">
+    <maplayer simplifyLocal="1" simplifyDrawingHints="0" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1" legendPlaceholderImage="" symbologyReferenceScale="-1" readOnly="0" refreshOnNotifyEnabled="0" minScale="100000000" maxScale="100000" type="vector" autoRefreshTime="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="1" styleCategories="AllStyleCategories" geometry="Point" autoRefreshEnabled="0" wkbType="Point">
       <extent>
         <xmin>18.37896929129519208</xmin>
         <ymin>-33.93500027904928373</ymin>
@@ -17371,7 +17373,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxy="0" minz="0" dimensions="2" maxx="0" maxz="0" miny="0" minx="0" crs=""/>
+          <spatial maxz="0" minx="0" maxx="0" minz="0" crs="" miny="0" maxy="0" dimensions="2"/>
           <temporal>
             <period>
               <start></start>
@@ -17396,58 +17398,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" startExpression="" mode="0" limitMode="0" endField="" fixedDuration="0" accumulate="0" durationUnit="min" startField="" endExpression="" enabled="0">
+      <temporal durationField="" fixedDuration="0" accumulate="0" endField="" startField="" enabled="0" startExpression="" endExpression="" durationUnit="min" mode="0" limitMode="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" zscale="1" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" binding="Centroid" type="IndividualFeatures" symbology="Line" extrusion="0" zoffset="0">
+      <elevation extrusionEnabled="0" symbology="Line" type="IndividualFeatures" zscale="1" clamping="Terrain" showMarkerSymbolInSurfacePlots="0" zoffset="0" extrusion="0" respectLayerSymbol="1" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="232,113,141,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="232,113,141,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -17478,36 +17480,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="232,113,141,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="166,81,101,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="232,113,141,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="166,81,101,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="232,113,141,255"/>
@@ -17522,44 +17524,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="232,113,141,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="166,81,101,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="232,113,141,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="diamond" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="166,81,101,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="3" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -17582,44 +17584,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" type="nullSymbol" symbollevels="0" referencescale="-1" enableorderby="0"/>
+      <renderer-v2 enableorderby="0" type="nullSymbol" symbollevels="0" referencescale="-1" forceraster="0"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="50" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="0.75" fieldName="name" useSubstitutions="0" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="8.5" namedStyle="Regular" forcedItalic="0" isExpression="0" fontSizeUnit="Point" allowHtml="0" legendString="Aa">
+          <text-style textOpacity="0.75" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="Regular" fontUnderline="0" fieldName="name" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" useSubstitutions="0" fontWeight="50" fontStrikeout="0" fontItalic="0" fontSize="8.5" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" isExpression="0" legendString="Aa" textOrientation="horizontal">
             <families/>
-            <text-buffer bufferNoFill="0" bufferBlendMode="0" bufferSize="1.5" bufferJoinStyle="64" bufferDraw="1" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="0.59999999999999998" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="0"/>
-            <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeBorderWidth="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-              <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <text-buffer bufferNoFill="0" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1.5" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="0.59999999999999998"/>
+            <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskType="0"/>
+            <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
+              <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                    <Option value="255,255,255,255" type="QString" name="color"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                    <Option value="no" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="solid" type="QString" name="style"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                    <Option type="QString" value="255,255,255,255" name="color"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                    <Option type="QString" value="no" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="solid" name="style"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -17634,109 +17636,109 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+            <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option type="Map" name="properties">
                   <Option type="Map" name="LabelRotation">
-                    <Option value="true" type="bool" name="active"/>
-                    <Option value="360 - (&quot;label_rota&quot;)" type="QString" name="expression"/>
-                    <Option value="3" type="int" name="type"/>
+                    <Option type="bool" value="true" name="active"/>
+                    <Option type="QString" value="360 - (&quot;label_rota&quot;)" name="expression"/>
+                    <Option type="int" value="3" name="type"/>
                   </Option>
                   <Option type="Map" name="PositionX">
-                    <Option value="true" type="bool" name="active"/>
-                    <Option value="label_x" type="QString" name="field"/>
-                    <Option value="2" type="int" name="type"/>
+                    <Option type="bool" value="true" name="active"/>
+                    <Option type="QString" value="label_x" name="field"/>
+                    <Option type="int" value="2" name="type"/>
                   </Option>
                   <Option type="Map" name="PositionY">
-                    <Option value="true" type="bool" name="active"/>
-                    <Option value="label_y" type="QString" name="field"/>
-                    <Option value="2" type="int" name="type"/>
+                    <Option type="bool" value="true" name="active"/>
+                    <Option type="QString" value="label_y" name="field"/>
+                    <Option type="int" value="2" name="type"/>
                   </Option>
                   <Option type="Map" name="Size">
-                    <Option value="true" type="bool" name="active"/>
-                    <Option value="if ('marshal' = attribute( $atlasfeature , 'type' ), '11', '9' )" type="QString" name="expression"/>
-                    <Option value="3" type="int" name="type"/>
+                    <Option type="bool" value="true" name="active"/>
+                    <Option type="QString" value="if ('marshal' = attribute( $atlasfeature , 'type' ), '11', '9' )" name="expression"/>
+                    <Option type="int" value="3" name="type"/>
                   </Option>
                 </Option>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format useMaxLineLengthForAutoWrap="1" leftDirectionSymbol="&lt;" wrapChar="" multilineAlign="0" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" decimals="3" rightDirectionSymbol=">" formatNumbers="0"/>
-          <placement overlapHandling="PreventOverlap" lineAnchorType="0" centroidInside="0" overrunDistance="0" centroidWhole="0" geometryGeneratorEnabled="0" rotationAngle="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" geometryGeneratorType="PointGeometry" quadOffset="4" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="6" xOffset="0" allowDegraded="0" lineAnchorTextPoint="CenterOfText" layerType="UnknownGeometry" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" maxCurvedCharAngleOut="-20" repeatDistance="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" dist="0" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" distUnits="MM" lineAnchorClipping="0" placementFlags="2" priority="1" overrunDistanceUnit="MM" maxCurvedCharAngleIn="20" geometryGenerator="" lineAnchorPercent="0.5" yOffset="0" rotationUnit="AngleDegrees"/>
-          <rendering fontMaxPixelSize="10000" drawLabels="1" mergeLines="0" zIndex="0" upsidedownLabels="0" obstacleFactor="0.20000000000000001" scaleVisibility="0" limitNumLabels="0" obstacleType="0" fontLimitPixelSize="0" maxNumLabels="2000" minFeatureSize="0" fontMinPixelSize="3" labelPerPart="0" obstacle="1" scaleMax="10000000" scaleMin="1" unplacedVisibility="0"/>
+          <text-format wrapChar="" rightDirectionSymbol=">" plussign="0" leftDirectionSymbol="&lt;" formatNumbers="0" decimals="3" multilineAlign="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
+          <placement offsetUnits="MapUnit" xOffset="0" maxCurvedCharAngleOut="-20" layerType="UnknownGeometry" allowDegraded="0" yOffset="0" overlapHandling="PreventOverlap" geometryGeneratorType="PointGeometry" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" repeatDistanceUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" quadOffset="4" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidWhole="0" overrunDistance="0" overrunDistanceUnit="MM" centroidInside="0" placement="6" geometryGenerator="" priority="1" distUnits="MM" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" dist="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorTextPoint="CenterOfText" polygonPlacementFlags="2" rotationUnit="AngleDegrees" offsetType="0" placementFlags="2" repeatDistance="0"/>
+          <rendering limitNumLabels="0" obstacleType="0" obstacle="1" scaleMax="10000000" maxNumLabels="2000" labelPerPart="0" scaleMin="1" upsidedownLabels="0" zIndex="0" unplacedVisibility="0" fontLimitPixelSize="0" minFeatureSize="0" fontMaxPixelSize="10000" scaleVisibility="0" fontMinPixelSize="3" drawLabels="1" mergeLines="0" obstacleFactor="0.20000000000000001"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="LabelRotation">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="360 - (&quot;label_rota&quot;)" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="360 - (&quot;label_rota&quot;)" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
                 <Option type="Map" name="PositionX">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="label_x" type="QString" name="field"/>
-                  <Option value="2" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="label_x" name="field"/>
+                  <Option type="int" value="2" name="type"/>
                 </Option>
                 <Option type="Map" name="PositionY">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="label_y" type="QString" name="field"/>
-                  <Option value="2" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="label_y" name="field"/>
+                  <Option type="int" value="2" name="type"/>
                 </Option>
                 <Option type="Map" name="Size">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="if ('marshal' = attribute( $atlasfeature , 'type' ), '11', '9' )" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="if ('marshal' = attribute( $atlasfeature , 'type' ), '11', '9' )" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-              <Option value="0" type="int" name="blendMode"/>
+              <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+              <Option type="int" value="0" name="blendMode"/>
               <Option type="Map" name="ddProperties">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
-              <Option value="false" type="bool" name="drawToAllParts"/>
-              <Option value="0" type="QString" name="enabled"/>
-              <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-              <Option value="&lt;symbol is_animated=&quot;0&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-              <Option value="0" type="double" name="minLength"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-              <Option value="MM" type="QString" name="minLengthUnit"/>
-              <Option value="0" type="double" name="offsetFromAnchor"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-              <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-              <Option value="0" type="double" name="offsetFromLabel"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-              <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+              <Option type="bool" value="false" name="drawToAllParts"/>
+              <Option type="QString" value="0" name="enabled"/>
+              <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
+              <Option type="QString" value="&lt;symbol alpha=&quot;1&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
+              <Option type="double" value="0" name="minLength"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
+              <Option type="QString" value="MM" name="minLengthUnit"/>
+              <Option type="double" value="0" name="offsetFromAnchor"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
+              <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
+              <Option type="double" value="0" name="offsetFromLabel"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
+              <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option value="&quot;name&quot;" type="QString" name="dualview/previewExpressions"/>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="QString" value="copy" name="QFieldSync/action"/>
+          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="&quot;name&quot;" name="dualview/previewExpressions"/>
+          <Option type="QString" value="0" name="embeddedWidgets/count"/>
           <Option type="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -17744,48 +17746,48 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory penAlpha="255" width="15" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" minimumSize="0" enabled="0" maxScaleDenominator="1e+08" diagramOrientation="Up" opacity="1" scaleBasedVisibility="0" spacingUnit="MM" minScaleDenominator="100000" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" lineSizeType="MM" penWidth="0" backgroundAlpha="255" scaleDependency="Area" spacing="0" direction="1" barWidth="5" sizeType="MM" height="15" penColor="#000000" showAxis="0">
-          <fontProperties bold="0" style="" italic="0" description="Arial,10,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0"/>
-          <attribute label="" colorOpacity="1" field="" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory height="15" scaleDependency="Area" width="15" lineSizeScale="3x:0,0,0,0,0,0" spacingUnit="MM" lineSizeType="MM" penColor="#000000" spacing="0" labelPlacementMethod="XHeight" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" backgroundAlpha="255" maxScaleDenominator="1e+08" barWidth="5" penWidth="0" minimumSize="0" penAlpha="255" minScaleDenominator="100000" sizeType="MM" backgroundColor="#ffffff" enabled="0" opacity="1" direction="1" scaleBasedVisibility="0" showAxis="0" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270">
+          <fontProperties style="" description="Arial,10,-1,5,50,0,0,0,0,0" strikethrough="0" italic="0" underline="0" bold="0"/>
+          <attribute color="#000000" field="" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="35,35,35,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0.26" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -17816,9 +17818,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -17826,28 +17828,28 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="2" showAll="1" placement="0" zIndex="0" dist="0" priority="0" obstacle="0">
+      <DiagramLayerSettings priority="0" linePlacementFlags="2" obstacle="0" dist="0" zIndex="0" placement="0" showAll="1">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field configurationFlags="None" name="id">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -17856,8 +17858,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -17866,8 +17868,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -17876,8 +17878,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -17886,8 +17888,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -17896,8 +17898,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -17906,8 +17908,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -17916,8 +17918,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -17926,73 +17928,73 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
-        <alias index="1" name="" field="osm_id"/>
-        <alias index="2" name="" field="name"/>
-        <alias index="3" name="" field="type"/>
-        <alias index="4" name="" field="z_order"/>
-        <alias index="5" name="" field="population"/>
-        <alias index="6" name="" field="label_x"/>
-        <alias index="7" name="" field="label_y"/>
-        <alias index="8" name="" field="label_rota"/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="osm_id" name=""/>
+        <alias index="2" field="name" name=""/>
+        <alias index="3" field="type" name=""/>
+        <alias index="4" field="z_order" name=""/>
+        <alias index="5" field="population" name=""/>
+        <alias index="6" field="label_x" name=""/>
+        <alias index="7" field="label_y" name=""/>
+        <alias index="8" field="label_rota" name=""/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="osm_id"/>
-        <default applyOnUpdate="0" expression="" field="name"/>
-        <default applyOnUpdate="0" expression="" field="type"/>
-        <default applyOnUpdate="0" expression="" field="z_order"/>
-        <default applyOnUpdate="0" expression="" field="population"/>
-        <default applyOnUpdate="0" expression="" field="label_x"/>
-        <default applyOnUpdate="0" expression="" field="label_y"/>
-        <default applyOnUpdate="0" expression="" field="label_rota"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="osm_id" expression=""/>
+        <default applyOnUpdate="0" field="name" expression=""/>
+        <default applyOnUpdate="0" field="type" expression=""/>
+        <default applyOnUpdate="0" field="z_order" expression=""/>
+        <default applyOnUpdate="0" field="population" expression=""/>
+        <default applyOnUpdate="0" field="label_x" expression=""/>
+        <default applyOnUpdate="0" field="label_y" expression=""/>
+        <default applyOnUpdate="0" field="label_rota" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="id" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="osm_id" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="name" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="type" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="z_order" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="population" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="label_x" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="label_y" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="label_rota" constraints="0"/>
+        <constraint exp_strength="0" field="id" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="osm_id" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="name" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="type" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="z_order" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="population" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="label_x" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="label_y" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="label_rota" notnull_strength="0" constraints="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" desc="" field="id"/>
-        <constraint exp="" desc="" field="osm_id"/>
-        <constraint exp="" desc="" field="name"/>
-        <constraint exp="" desc="" field="type"/>
-        <constraint exp="" desc="" field="z_order"/>
-        <constraint exp="" desc="" field="population"/>
-        <constraint exp="" desc="" field="label_x"/>
-        <constraint exp="" desc="" field="label_y"/>
-        <constraint exp="" desc="" field="label_rota"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="osm_id" desc=""/>
+        <constraint exp="" field="name" desc=""/>
+        <constraint exp="" field="type" desc=""/>
+        <constraint exp="" field="z_order" desc=""/>
+        <constraint exp="" field="population" desc=""/>
+        <constraint exp="" field="label_x" desc=""/>
+        <constraint exp="" field="label_y" desc=""/>
+        <constraint exp="" field="label_rota" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column width="-1" type="field" name="id" hidden="0"/>
-          <column width="-1" type="field" name="osm_id" hidden="0"/>
-          <column width="-1" type="field" name="name" hidden="0"/>
-          <column width="-1" type="field" name="type" hidden="0"/>
-          <column width="-1" type="field" name="z_order" hidden="0"/>
-          <column width="-1" type="field" name="population" hidden="0"/>
+          <column width="-1" type="field" hidden="0" name="id"/>
+          <column width="-1" type="field" hidden="0" name="osm_id"/>
+          <column width="-1" type="field" hidden="0" name="name"/>
+          <column width="-1" type="field" hidden="0" name="type"/>
+          <column width="-1" type="field" hidden="0" name="z_order"/>
+          <column width="-1" type="field" hidden="0" name="population"/>
           <column width="-1" type="actions" hidden="1"/>
-          <column width="-1" type="field" name="label_x" hidden="0"/>
-          <column width="-1" type="field" name="label_y" hidden="0"/>
-          <column width="-1" type="field" name="label_rota" hidden="0"/>
+          <column width="-1" type="field" hidden="0" name="label_x"/>
+          <column width="-1" type="field" hidden="0" name="label_y"/>
+          <column width="-1" type="field" hidden="0" name="label_rota"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -18024,26 +18026,26 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="id" editable="1"/>
-        <field name="label_rota" editable="1"/>
-        <field name="label_x" editable="1"/>
-        <field name="label_y" editable="1"/>
-        <field name="name" editable="1"/>
-        <field name="osm_id" editable="1"/>
-        <field name="population" editable="1"/>
-        <field name="type" editable="1"/>
-        <field name="z_order" editable="1"/>
+        <field editable="1" name="id"/>
+        <field editable="1" name="label_rota"/>
+        <field editable="1" name="label_x"/>
+        <field editable="1" name="label_y"/>
+        <field editable="1" name="name"/>
+        <field editable="1" name="osm_id"/>
+        <field editable="1" name="population"/>
+        <field editable="1" name="type"/>
+        <field editable="1" name="z_order"/>
       </editable>
       <labelOnTop>
-        <field name="id" labelOnTop="0"/>
-        <field name="label_rota" labelOnTop="0"/>
-        <field name="label_x" labelOnTop="0"/>
-        <field name="label_y" labelOnTop="0"/>
-        <field name="name" labelOnTop="0"/>
-        <field name="osm_id" labelOnTop="0"/>
-        <field name="population" labelOnTop="0"/>
-        <field name="type" labelOnTop="0"/>
-        <field name="z_order" labelOnTop="0"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="label_rota"/>
+        <field labelOnTop="0" name="label_x"/>
+        <field labelOnTop="0" name="label_y"/>
+        <field labelOnTop="0" name="name"/>
+        <field labelOnTop="0" name="osm_id"/>
+        <field labelOnTop="0" name="population"/>
+        <field labelOnTop="0" name="type"/>
+        <field labelOnTop="0" name="z_order"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -18051,7 +18053,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" simplifyLocal="1" autoRefreshTime="0" wkbType="MultiLineString" simplifyDrawingHints="0" type="vector" symbologyReferenceScale="-1" minScale="100000000" legendPlaceholderImage="" refreshOnNotifyEnabled="0" labelsEnabled="1" maxScale="100000" styleCategories="AllStyleCategories" simplifyAlgorithm="0" refreshOnNotifyMessage="" readOnly="0" geometry="Line" autoRefreshEnabled="0" simplifyDrawingTol="1">
+    <maplayer simplifyLocal="1" simplifyDrawingHints="0" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1" legendPlaceholderImage="" symbologyReferenceScale="-1" readOnly="0" refreshOnNotifyEnabled="0" minScale="100000000" maxScale="100000" type="vector" autoRefreshTime="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="1" styleCategories="AllStyleCategories" geometry="Line" autoRefreshEnabled="0" wkbType="MultiLineString">
       <extent>
         <xmin>18.3437671999999985</xmin>
         <ymin>-34.02801110000000051</ymin>
@@ -18116,7 +18118,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxy="0" minz="0" dimensions="2" maxx="0" maxz="0" miny="0" minx="0" crs=""/>
+          <spatial maxz="0" minx="0" maxx="0" minz="0" crs="" miny="0" maxy="0" dimensions="2"/>
           <temporal>
             <period>
               <start></start>
@@ -18141,58 +18143,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" startExpression="" mode="0" limitMode="0" endField="" fixedDuration="0" accumulate="0" durationUnit="min" startField="" endExpression="" enabled="0">
+      <temporal durationField="" fixedDuration="0" accumulate="0" endField="" startField="" enabled="0" startExpression="" endExpression="" durationUnit="min" mode="0" limitMode="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" zscale="1" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" binding="Centroid" type="IndividualFeatures" symbology="Line" extrusion="0" zoffset="0">
+      <elevation extrusionEnabled="0" symbology="Line" type="IndividualFeatures" zscale="1" clamping="Terrain" showMarkerSymbolInSurfacePlots="0" zoffset="0" extrusion="0" respectLayerSymbol="1" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="255,158,23,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="255,158,23,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -18223,36 +18225,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="255,158,23,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="182,113,16,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="255,158,23,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="182,113,16,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,158,23,255"/>
@@ -18267,44 +18269,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="255,158,23,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="182,113,16,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="255,158,23,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="diamond" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="182,113,16,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="3" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -18327,52 +18329,52 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" type="nullSymbol" symbollevels="0" referencescale="-1" enableorderby="0"/>
+      <renderer-v2 enableorderby="0" type="nullSymbol" symbollevels="0" referencescale="-1" forceraster="0"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="50" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="0.80000000000000004" fieldName="if( &quot;never_show&quot;, '', &quot;name&quot; )" useSubstitutions="0" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="7" namedStyle="Regular" forcedItalic="0" isExpression="1" fontSizeUnit="Point" allowHtml="0" legendString="Aa">
+          <text-style textOpacity="0.80000000000000004" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="Regular" fontUnderline="0" fieldName="if( &quot;never_show&quot;, '', &quot;name&quot; )" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" useSubstitutions="0" fontWeight="50" fontStrikeout="0" fontItalic="0" fontSize="7" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" isExpression="1" legendString="Aa" textOrientation="horizontal">
             <families/>
-            <text-buffer bufferNoFill="0" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferDraw="1" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="0.59999999999999998" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="0"/>
-            <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeBorderWidth="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-              <symbol is_animated="0" type="marker" name="markerSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <text-buffer bufferNoFill="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="0.59999999999999998"/>
+            <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskType="0"/>
+            <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
+              <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="markerSymbol">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="196,60,57,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="2" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="square" name="cap_style"/>
+                    <Option type="QString" value="196,60,57,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="circle" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                    <Option type="QString" value="solid" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="2" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -18395,34 +18397,34 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
-              <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+              <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                    <Option value="255,255,255,255" type="QString" name="color"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                    <Option value="no" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="solid" type="QString" name="style"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                    <Option type="QString" value="255,255,255,255" name="color"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                    <Option type="QString" value="no" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="solid" name="style"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -18437,116 +18439,116 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+            <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format useMaxLineLengthForAutoWrap="1" leftDirectionSymbol="&lt;" wrapChar="" multilineAlign="0" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" decimals="3" rightDirectionSymbol=">" formatNumbers="0"/>
-          <placement overlapHandling="PreventOverlap" lineAnchorType="0" centroidInside="0" overrunDistance="0" centroidWhole="0" geometryGeneratorEnabled="0" rotationAngle="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" geometryGeneratorType="PointGeometry" quadOffset="4" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="3" xOffset="0" allowDegraded="0" lineAnchorTextPoint="CenterOfText" layerType="LineGeometry" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" maxCurvedCharAngleOut="-20" repeatDistance="0" offsetUnits="MapUnit" repeatDistanceUnits="MapUnit" dist="0" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" distUnits="MM" lineAnchorClipping="0" placementFlags="4" priority="3" overrunDistanceUnit="MM" maxCurvedCharAngleIn="20" geometryGenerator="" lineAnchorPercent="0.5" yOffset="0" rotationUnit="AngleDegrees"/>
-          <rendering fontMaxPixelSize="10000" drawLabels="1" mergeLines="1" zIndex="0" upsidedownLabels="0" obstacleFactor="0.29999999999999999" scaleVisibility="0" limitNumLabels="0" obstacleType="0" fontLimitPixelSize="0" maxNumLabels="2000" minFeatureSize="5" fontMinPixelSize="3" labelPerPart="0" obstacle="1" scaleMax="10000000" scaleMin="1" unplacedVisibility="0"/>
+          <text-format wrapChar="" rightDirectionSymbol=">" plussign="0" leftDirectionSymbol="&lt;" formatNumbers="0" decimals="3" multilineAlign="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
+          <placement offsetUnits="MapUnit" xOffset="0" maxCurvedCharAngleOut="-20" layerType="LineGeometry" allowDegraded="0" yOffset="0" overlapHandling="PreventOverlap" geometryGeneratorType="PointGeometry" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" repeatDistanceUnits="MapUnit" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" quadOffset="4" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidWhole="0" overrunDistance="0" overrunDistanceUnit="MM" centroidInside="0" placement="3" geometryGenerator="" priority="3" distUnits="MM" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" dist="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorTextPoint="CenterOfText" polygonPlacementFlags="2" rotationUnit="AngleDegrees" offsetType="0" placementFlags="4" repeatDistance="0"/>
+          <rendering limitNumLabels="0" obstacleType="0" obstacle="1" scaleMax="10000000" maxNumLabels="2000" labelPerPart="0" scaleMin="1" upsidedownLabels="0" zIndex="0" unplacedVisibility="0" fontLimitPixelSize="0" minFeatureSize="5" fontMaxPixelSize="10000" scaleVisibility="0" fontMinPixelSize="3" drawLabels="1" mergeLines="1" obstacleFactor="0.29999999999999999"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="AlwaysShow">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="always_sho" type="QString" name="field"/>
-                  <Option value="2" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="always_sho" name="field"/>
+                  <Option type="int" value="2" name="type"/>
                 </Option>
                 <Option type="Map" name="IsObstacle">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="&quot;&quot;" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="&quot;&quot;" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
                 <Option type="Map" name="LabelRotation">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="360 - (&quot;label_rota&quot;)" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="360 - (&quot;label_rota&quot;)" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
                 <Option type="Map" name="PositionX">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="label_x" type="QString" name="field"/>
-                  <Option value="2" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="label_x" name="field"/>
+                  <Option type="int" value="2" name="type"/>
                 </Option>
                 <Option type="Map" name="PositionY">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="label_y" type="QString" name="field"/>
-                  <Option value="2" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="label_y" name="field"/>
+                  <Option type="int" value="2" name="type"/>
                 </Option>
                 <Option type="Map" name="Priority">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="1" type="int" name="type"/>
-                  <Option value="" type="QString" name="val"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="int" value="1" name="type"/>
+                  <Option type="QString" value="" name="val"/>
                 </Option>
                 <Option type="Map" name="Show">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="auxiliary_storage_labeling_show" type="QString" name="field"/>
-                  <Option value="2" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="auxiliary_storage_labeling_show" name="field"/>
+                  <Option type="int" value="2" name="type"/>
                 </Option>
                 <Option type="Map" name="Size">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="if ('marshal' = attribute( @atlas_feature, 'type' ), '10', '8' )" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="if ('marshal' = attribute( @atlas_feature, 'type' ), '10', '8' )" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-              <Option value="0" type="int" name="blendMode"/>
+              <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+              <Option type="int" value="0" name="blendMode"/>
               <Option type="Map" name="ddProperties">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
-              <Option value="false" type="bool" name="drawToAllParts"/>
-              <Option value="0" type="QString" name="enabled"/>
-              <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-              <Option value="&lt;symbol is_animated=&quot;0&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-              <Option value="0" type="double" name="minLength"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-              <Option value="MM" type="QString" name="minLengthUnit"/>
-              <Option value="0" type="double" name="offsetFromAnchor"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-              <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-              <Option value="0" type="double" name="offsetFromLabel"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-              <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+              <Option type="bool" value="false" name="drawToAllParts"/>
+              <Option type="QString" value="0" name="enabled"/>
+              <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
+              <Option type="QString" value="&lt;symbol alpha=&quot;1&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
+              <Option type="double" value="0" name="minLength"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
+              <Option type="QString" value="MM" name="minLengthUnit"/>
+              <Option type="double" value="0" name="offsetFromAnchor"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
+              <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
+              <Option type="double" value="0" name="offsetFromLabel"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
+              <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="copy" name="QFieldSync/action"/>
+          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
           <Option type="List" name="dualview/previewExpressions">
-            <Option value="COALESCE( &quot;name&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;name&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;name&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;name&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;name&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;name&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;name&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option type="QString" value="COALESCE( &quot;name&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;name&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;name&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;name&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;name&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;name&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;name&quot;, '&lt;NULL>' )"/>
           </Option>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="QString" value="0" name="embeddedWidgets/count"/>
           <Option type="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -18554,48 +18556,48 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory penAlpha="255" width="15" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" minimumSize="0" enabled="0" maxScaleDenominator="1e+08" diagramOrientation="Up" opacity="1" scaleBasedVisibility="0" spacingUnit="MM" minScaleDenominator="100000" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" lineSizeType="MM" penWidth="0" backgroundAlpha="255" scaleDependency="Area" spacing="0" direction="1" barWidth="5" sizeType="MM" height="15" penColor="#000000" showAxis="0">
-          <fontProperties bold="0" style="" italic="0" description="Arial,10,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0"/>
-          <attribute label="" colorOpacity="1" field="" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory height="15" scaleDependency="Area" width="15" lineSizeScale="3x:0,0,0,0,0,0" spacingUnit="MM" lineSizeType="MM" penColor="#000000" spacing="0" labelPlacementMethod="XHeight" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" backgroundAlpha="255" maxScaleDenominator="1e+08" barWidth="5" penWidth="0" minimumSize="0" penAlpha="255" minScaleDenominator="100000" sizeType="MM" backgroundColor="#ffffff" enabled="0" opacity="1" direction="1" scaleBasedVisibility="0" showAxis="0" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270">
+          <fontProperties style="" description="Arial,10,-1,5,50,0,0,0,0,0" strikethrough="0" italic="0" underline="0" bold="0"/>
+          <attribute color="#000000" field="" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="35,35,35,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0.26" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -18626,9 +18628,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -18636,28 +18638,28 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="2" showAll="1" placement="2" zIndex="0" dist="0" priority="0" obstacle="0">
+      <DiagramLayerSettings priority="0" linePlacementFlags="2" obstacle="0" dist="0" zIndex="0" placement="2" showAll="1">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field configurationFlags="None" name="osm_id">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -18666,8 +18668,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -18711,8 +18713,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -18775,100 +18777,100 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="osm_id"/>
-        <alias index="1" name="" field="name"/>
-        <alias index="2" name="" field="highway"/>
-        <alias index="3" name="" field="waterway"/>
-        <alias index="4" name="" field="aerialway"/>
-        <alias index="5" name="" field="barrier"/>
-        <alias index="6" name="" field="man_made"/>
-        <alias index="7" name="" field="z_order"/>
-        <alias index="8" name="" field="other_tags"/>
-        <alias index="9" name="" field="never_show"/>
-        <alias index="10" name="" field="label_x"/>
-        <alias index="11" name="" field="label_y"/>
-        <alias index="12" name="" field="label_rota"/>
-        <alias index="13" name="" field="always_sho"/>
-        <alias index="14" name="" field="resident_a"/>
-        <alias index="15" name="" field="auxiliary_storage_labeling_show"/>
+        <alias index="0" field="osm_id" name=""/>
+        <alias index="1" field="name" name=""/>
+        <alias index="2" field="highway" name=""/>
+        <alias index="3" field="waterway" name=""/>
+        <alias index="4" field="aerialway" name=""/>
+        <alias index="5" field="barrier" name=""/>
+        <alias index="6" field="man_made" name=""/>
+        <alias index="7" field="z_order" name=""/>
+        <alias index="8" field="other_tags" name=""/>
+        <alias index="9" field="never_show" name=""/>
+        <alias index="10" field="label_x" name=""/>
+        <alias index="11" field="label_y" name=""/>
+        <alias index="12" field="label_rota" name=""/>
+        <alias index="13" field="always_sho" name=""/>
+        <alias index="14" field="resident_a" name=""/>
+        <alias index="15" field="auxiliary_storage_labeling_show" name=""/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="osm_id"/>
-        <default applyOnUpdate="0" expression="" field="name"/>
-        <default applyOnUpdate="0" expression="" field="highway"/>
-        <default applyOnUpdate="0" expression="" field="waterway"/>
-        <default applyOnUpdate="0" expression="" field="aerialway"/>
-        <default applyOnUpdate="0" expression="" field="barrier"/>
-        <default applyOnUpdate="0" expression="" field="man_made"/>
-        <default applyOnUpdate="0" expression="" field="z_order"/>
-        <default applyOnUpdate="0" expression="" field="other_tags"/>
-        <default applyOnUpdate="0" expression="" field="never_show"/>
-        <default applyOnUpdate="0" expression="" field="label_x"/>
-        <default applyOnUpdate="0" expression="" field="label_y"/>
-        <default applyOnUpdate="0" expression="" field="label_rota"/>
-        <default applyOnUpdate="0" expression="" field="always_sho"/>
-        <default applyOnUpdate="0" expression="" field="resident_a"/>
-        <default applyOnUpdate="0" expression="" field="auxiliary_storage_labeling_show"/>
+        <default applyOnUpdate="0" field="osm_id" expression=""/>
+        <default applyOnUpdate="0" field="name" expression=""/>
+        <default applyOnUpdate="0" field="highway" expression=""/>
+        <default applyOnUpdate="0" field="waterway" expression=""/>
+        <default applyOnUpdate="0" field="aerialway" expression=""/>
+        <default applyOnUpdate="0" field="barrier" expression=""/>
+        <default applyOnUpdate="0" field="man_made" expression=""/>
+        <default applyOnUpdate="0" field="z_order" expression=""/>
+        <default applyOnUpdate="0" field="other_tags" expression=""/>
+        <default applyOnUpdate="0" field="never_show" expression=""/>
+        <default applyOnUpdate="0" field="label_x" expression=""/>
+        <default applyOnUpdate="0" field="label_y" expression=""/>
+        <default applyOnUpdate="0" field="label_rota" expression=""/>
+        <default applyOnUpdate="0" field="always_sho" expression=""/>
+        <default applyOnUpdate="0" field="resident_a" expression=""/>
+        <default applyOnUpdate="0" field="auxiliary_storage_labeling_show" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="osm_id" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="name" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="highway" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="waterway" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="aerialway" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="barrier" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="man_made" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="z_order" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="other_tags" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="never_show" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="label_x" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="label_y" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="label_rota" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="always_sho" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="resident_a" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="auxiliary_storage_labeling_show" constraints="0"/>
+        <constraint exp_strength="0" field="osm_id" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="name" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="highway" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="waterway" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="aerialway" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="barrier" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="man_made" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="z_order" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="other_tags" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="never_show" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="label_x" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="label_y" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="label_rota" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="always_sho" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="resident_a" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="auxiliary_storage_labeling_show" notnull_strength="0" constraints="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" desc="" field="osm_id"/>
-        <constraint exp="" desc="" field="name"/>
-        <constraint exp="" desc="" field="highway"/>
-        <constraint exp="" desc="" field="waterway"/>
-        <constraint exp="" desc="" field="aerialway"/>
-        <constraint exp="" desc="" field="barrier"/>
-        <constraint exp="" desc="" field="man_made"/>
-        <constraint exp="" desc="" field="z_order"/>
-        <constraint exp="" desc="" field="other_tags"/>
-        <constraint exp="" desc="" field="never_show"/>
-        <constraint exp="" desc="" field="label_x"/>
-        <constraint exp="" desc="" field="label_y"/>
-        <constraint exp="" desc="" field="label_rota"/>
-        <constraint exp="" desc="" field="always_sho"/>
-        <constraint exp="" desc="" field="resident_a"/>
-        <constraint exp="" desc="" field="auxiliary_storage_labeling_show"/>
+        <constraint exp="" field="osm_id" desc=""/>
+        <constraint exp="" field="name" desc=""/>
+        <constraint exp="" field="highway" desc=""/>
+        <constraint exp="" field="waterway" desc=""/>
+        <constraint exp="" field="aerialway" desc=""/>
+        <constraint exp="" field="barrier" desc=""/>
+        <constraint exp="" field="man_made" desc=""/>
+        <constraint exp="" field="z_order" desc=""/>
+        <constraint exp="" field="other_tags" desc=""/>
+        <constraint exp="" field="never_show" desc=""/>
+        <constraint exp="" field="label_x" desc=""/>
+        <constraint exp="" field="label_y" desc=""/>
+        <constraint exp="" field="label_rota" desc=""/>
+        <constraint exp="" field="always_sho" desc=""/>
+        <constraint exp="" field="resident_a" desc=""/>
+        <constraint exp="" field="auxiliary_storage_labeling_show" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="&quot;osm_id&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="&quot;osm_id&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column width="-1" type="field" name="osm_id" hidden="0"/>
-          <column width="160" type="field" name="name" hidden="0"/>
-          <column width="-1" type="field" name="z_order" hidden="0"/>
+          <column width="-1" type="field" hidden="0" name="osm_id"/>
+          <column width="160" type="field" hidden="0" name="name"/>
+          <column width="-1" type="field" hidden="0" name="z_order"/>
           <column width="-1" type="actions" hidden="1"/>
-          <column width="-1" type="field" name="highway" hidden="0"/>
-          <column width="-1" type="field" name="waterway" hidden="0"/>
-          <column width="-1" type="field" name="aerialway" hidden="0"/>
-          <column width="-1" type="field" name="barrier" hidden="0"/>
-          <column width="-1" type="field" name="man_made" hidden="0"/>
-          <column width="142" type="field" name="other_tags" hidden="0"/>
-          <column width="-1" type="field" name="never_show" hidden="0"/>
-          <column width="-1" type="field" name="label_x" hidden="0"/>
-          <column width="-1" type="field" name="label_y" hidden="0"/>
-          <column width="-1" type="field" name="label_rota" hidden="0"/>
-          <column width="-1" type="field" name="always_sho" hidden="0"/>
-          <column width="-1" type="field" name="resident_a" hidden="0"/>
-          <column width="-1" type="field" name="auxiliary_storage_labeling_show" hidden="0"/>
+          <column width="-1" type="field" hidden="0" name="highway"/>
+          <column width="-1" type="field" hidden="0" name="waterway"/>
+          <column width="-1" type="field" hidden="0" name="aerialway"/>
+          <column width="-1" type="field" hidden="0" name="barrier"/>
+          <column width="-1" type="field" hidden="0" name="man_made"/>
+          <column width="142" type="field" hidden="0" name="other_tags"/>
+          <column width="-1" type="field" hidden="0" name="never_show"/>
+          <column width="-1" type="field" hidden="0" name="label_x"/>
+          <column width="-1" type="field" hidden="0" name="label_y"/>
+          <column width="-1" type="field" hidden="0" name="label_rota"/>
+          <column width="-1" type="field" hidden="0" name="always_sho"/>
+          <column width="-1" type="field" hidden="0" name="resident_a"/>
+          <column width="-1" type="field" hidden="0" name="auxiliary_storage_labeling_show"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -18900,94 +18902,94 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="aerialway" editable="1"/>
-        <field name="always_sho" editable="1"/>
-        <field name="auxiliary_storage_labeling_show" editable="0"/>
-        <field name="barrier" editable="1"/>
-        <field name="highway" editable="1"/>
-        <field name="label_rota" editable="1"/>
-        <field name="label_x" editable="1"/>
-        <field name="label_y" editable="1"/>
-        <field name="man_made" editable="1"/>
-        <field name="name" editable="1"/>
-        <field name="never_show" editable="1"/>
-        <field name="orig_access" editable="0"/>
-        <field name="orig_always_sho" editable="0"/>
-        <field name="orig_bridge" editable="0"/>
-        <field name="orig_c_z_order" editable="0"/>
-        <field name="orig_class" editable="0"/>
-        <field name="orig_id" editable="0"/>
-        <field name="orig_label_rota" editable="0"/>
-        <field name="orig_label_x" editable="0"/>
-        <field name="orig_label_y" editable="0"/>
-        <field name="orig_name" editable="0"/>
-        <field name="orig_oneway" editable="0"/>
-        <field name="orig_ref" editable="0"/>
-        <field name="orig_service" editable="0"/>
-        <field name="orig_show" editable="0"/>
-        <field name="orig_tunnel" editable="0"/>
-        <field name="orig_type" editable="0"/>
-        <field name="orig_z_order" editable="0"/>
-        <field name="osm_id" editable="1"/>
-        <field name="other_tags" editable="1"/>
-        <field name="resident_a" editable="1"/>
-        <field name="resident_access" editable="1"/>
-        <field name="waterway" editable="1"/>
-        <field name="z_order" editable="1"/>
+        <field editable="1" name="aerialway"/>
+        <field editable="1" name="always_sho"/>
+        <field editable="0" name="auxiliary_storage_labeling_show"/>
+        <field editable="1" name="barrier"/>
+        <field editable="1" name="highway"/>
+        <field editable="1" name="label_rota"/>
+        <field editable="1" name="label_x"/>
+        <field editable="1" name="label_y"/>
+        <field editable="1" name="man_made"/>
+        <field editable="1" name="name"/>
+        <field editable="1" name="never_show"/>
+        <field editable="0" name="orig_access"/>
+        <field editable="0" name="orig_always_sho"/>
+        <field editable="0" name="orig_bridge"/>
+        <field editable="0" name="orig_c_z_order"/>
+        <field editable="0" name="orig_class"/>
+        <field editable="0" name="orig_id"/>
+        <field editable="0" name="orig_label_rota"/>
+        <field editable="0" name="orig_label_x"/>
+        <field editable="0" name="orig_label_y"/>
+        <field editable="0" name="orig_name"/>
+        <field editable="0" name="orig_oneway"/>
+        <field editable="0" name="orig_ref"/>
+        <field editable="0" name="orig_service"/>
+        <field editable="0" name="orig_show"/>
+        <field editable="0" name="orig_tunnel"/>
+        <field editable="0" name="orig_type"/>
+        <field editable="0" name="orig_z_order"/>
+        <field editable="1" name="osm_id"/>
+        <field editable="1" name="other_tags"/>
+        <field editable="1" name="resident_a"/>
+        <field editable="1" name="resident_access"/>
+        <field editable="1" name="waterway"/>
+        <field editable="1" name="z_order"/>
       </editable>
       <labelOnTop>
-        <field name="aerialway" labelOnTop="0"/>
-        <field name="always_sho" labelOnTop="0"/>
-        <field name="auxiliary_storage_labeling_show" labelOnTop="0"/>
-        <field name="barrier" labelOnTop="0"/>
-        <field name="highway" labelOnTop="0"/>
-        <field name="label_rota" labelOnTop="0"/>
-        <field name="label_x" labelOnTop="0"/>
-        <field name="label_y" labelOnTop="0"/>
-        <field name="man_made" labelOnTop="0"/>
-        <field name="name" labelOnTop="0"/>
-        <field name="never_show" labelOnTop="0"/>
-        <field name="orig_access" labelOnTop="0"/>
-        <field name="orig_always_sho" labelOnTop="0"/>
-        <field name="orig_bridge" labelOnTop="0"/>
-        <field name="orig_c_z_order" labelOnTop="0"/>
-        <field name="orig_class" labelOnTop="0"/>
-        <field name="orig_id" labelOnTop="0"/>
-        <field name="orig_label_rota" labelOnTop="0"/>
-        <field name="orig_label_x" labelOnTop="0"/>
-        <field name="orig_label_y" labelOnTop="0"/>
-        <field name="orig_name" labelOnTop="0"/>
-        <field name="orig_oneway" labelOnTop="0"/>
-        <field name="orig_ref" labelOnTop="0"/>
-        <field name="orig_service" labelOnTop="0"/>
-        <field name="orig_show" labelOnTop="0"/>
-        <field name="orig_tunnel" labelOnTop="0"/>
-        <field name="orig_type" labelOnTop="0"/>
-        <field name="orig_z_order" labelOnTop="0"/>
-        <field name="osm_id" labelOnTop="0"/>
-        <field name="other_tags" labelOnTop="0"/>
-        <field name="resident_a" labelOnTop="0"/>
-        <field name="resident_access" labelOnTop="0"/>
-        <field name="waterway" labelOnTop="0"/>
-        <field name="z_order" labelOnTop="0"/>
+        <field labelOnTop="0" name="aerialway"/>
+        <field labelOnTop="0" name="always_sho"/>
+        <field labelOnTop="0" name="auxiliary_storage_labeling_show"/>
+        <field labelOnTop="0" name="barrier"/>
+        <field labelOnTop="0" name="highway"/>
+        <field labelOnTop="0" name="label_rota"/>
+        <field labelOnTop="0" name="label_x"/>
+        <field labelOnTop="0" name="label_y"/>
+        <field labelOnTop="0" name="man_made"/>
+        <field labelOnTop="0" name="name"/>
+        <field labelOnTop="0" name="never_show"/>
+        <field labelOnTop="0" name="orig_access"/>
+        <field labelOnTop="0" name="orig_always_sho"/>
+        <field labelOnTop="0" name="orig_bridge"/>
+        <field labelOnTop="0" name="orig_c_z_order"/>
+        <field labelOnTop="0" name="orig_class"/>
+        <field labelOnTop="0" name="orig_id"/>
+        <field labelOnTop="0" name="orig_label_rota"/>
+        <field labelOnTop="0" name="orig_label_x"/>
+        <field labelOnTop="0" name="orig_label_y"/>
+        <field labelOnTop="0" name="orig_name"/>
+        <field labelOnTop="0" name="orig_oneway"/>
+        <field labelOnTop="0" name="orig_ref"/>
+        <field labelOnTop="0" name="orig_service"/>
+        <field labelOnTop="0" name="orig_show"/>
+        <field labelOnTop="0" name="orig_tunnel"/>
+        <field labelOnTop="0" name="orig_type"/>
+        <field labelOnTop="0" name="orig_z_order"/>
+        <field labelOnTop="0" name="osm_id"/>
+        <field labelOnTop="0" name="other_tags"/>
+        <field labelOnTop="0" name="resident_a"/>
+        <field labelOnTop="0" name="resident_access"/>
+        <field labelOnTop="0" name="waterway"/>
+        <field labelOnTop="0" name="z_order"/>
       </labelOnTop>
       <reuseLastValue>
-        <field name="aerialway" reuseLastValue="0"/>
-        <field name="always_sho" reuseLastValue="0"/>
-        <field name="auxiliary_storage_labeling_show" reuseLastValue="0"/>
-        <field name="barrier" reuseLastValue="0"/>
-        <field name="highway" reuseLastValue="0"/>
-        <field name="label_rota" reuseLastValue="0"/>
-        <field name="label_x" reuseLastValue="0"/>
-        <field name="label_y" reuseLastValue="0"/>
-        <field name="man_made" reuseLastValue="0"/>
-        <field name="name" reuseLastValue="0"/>
-        <field name="never_show" reuseLastValue="0"/>
-        <field name="osm_id" reuseLastValue="0"/>
-        <field name="other_tags" reuseLastValue="0"/>
-        <field name="resident_a" reuseLastValue="0"/>
-        <field name="waterway" reuseLastValue="0"/>
-        <field name="z_order" reuseLastValue="0"/>
+        <field reuseLastValue="0" name="aerialway"/>
+        <field reuseLastValue="0" name="always_sho"/>
+        <field reuseLastValue="0" name="auxiliary_storage_labeling_show"/>
+        <field reuseLastValue="0" name="barrier"/>
+        <field reuseLastValue="0" name="highway"/>
+        <field reuseLastValue="0" name="label_rota"/>
+        <field reuseLastValue="0" name="label_x"/>
+        <field reuseLastValue="0" name="label_y"/>
+        <field reuseLastValue="0" name="man_made"/>
+        <field reuseLastValue="0" name="name"/>
+        <field reuseLastValue="0" name="never_show"/>
+        <field reuseLastValue="0" name="osm_id"/>
+        <field reuseLastValue="0" name="other_tags"/>
+        <field reuseLastValue="0" name="resident_a"/>
+        <field reuseLastValue="0" name="waterway"/>
+        <field reuseLastValue="0" name="z_order"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets>
@@ -19037,7 +19039,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" simplifyLocal="1" autoRefreshTime="0" wkbType="Point" simplifyDrawingHints="0" type="vector" symbologyReferenceScale="-1" minScale="100000000" legendPlaceholderImage="" refreshOnNotifyEnabled="0" labelsEnabled="1" maxScale="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" refreshOnNotifyMessage="" readOnly="0" geometry="Point" autoRefreshEnabled="0" simplifyDrawingTol="1">
+    <maplayer simplifyLocal="1" simplifyDrawingHints="0" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1" legendPlaceholderImage="" symbologyReferenceScale="-1" readOnly="0" refreshOnNotifyEnabled="0" minScale="100000000" maxScale="0" type="vector" autoRefreshTime="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="1" styleCategories="AllStyleCategories" geometry="Point" autoRefreshEnabled="0" wkbType="Point">
       <extent>
         <xmin>18.3984390148267174</xmin>
         <ymin>-33.90832575607554134</ymin>
@@ -19102,7 +19104,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxy="0" minz="0" dimensions="2" maxx="0" maxz="0" miny="0" minx="0" crs=""/>
+          <spatial maxz="0" minx="0" maxx="0" minz="0" crs="" miny="0" maxy="0" dimensions="2"/>
           <temporal>
             <period>
               <start></start>
@@ -19127,58 +19129,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" startExpression="" mode="0" limitMode="0" endField="" fixedDuration="0" accumulate="0" durationUnit="min" startField="" endExpression="" enabled="0">
+      <temporal durationField="" fixedDuration="0" accumulate="0" endField="" startField="" enabled="0" startExpression="" endExpression="" durationUnit="min" mode="0" limitMode="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" zscale="1" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" binding="Centroid" type="IndividualFeatures" symbology="Line" extrusion="0" zoffset="0">
+      <elevation extrusionEnabled="0" symbology="Line" type="IndividualFeatures" zscale="1" clamping="Terrain" showMarkerSymbolInSurfacePlots="0" zoffset="0" extrusion="0" respectLayerSymbol="1" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="231,113,72,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="231,113,72,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -19209,36 +19211,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="231,113,72,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="165,81,51,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="231,113,72,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="165,81,51,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="231,113,72,255"/>
@@ -19253,44 +19255,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="231,113,72,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="165,81,51,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="231,113,72,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="diamond" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="165,81,51,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="3" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -19313,54 +19315,54 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" type="RuleRenderer" symbollevels="0" referencescale="-1" enableorderby="0">
+      <renderer-v2 enableorderby="0" type="RuleRenderer" symbollevels="0" referencescale="-1" forceraster="0">
         <rules key="{0927a9cd-bbb2-44ea-811b-fdbcb767a09a}">
-          <rule filter="regexp_match( &quot;type&quot;, '(start|finish)')" symbol="0" key="{efda7615-994b-459d-a657-ee8185286b0b}"/>
-          <rule filter="&quot;type&quot; = 'toilets'" symbol="1" key="{98bd58c0-fb3f-467c-aba3-c7ae911ad149}"/>
-          <rule filter="&quot;type&quot; = 'togbag'" symbol="2" key="{0d82fc83-a3cd-4068-9d3a-0fb004f8cfa5}"/>
-          <rule filter=" &quot;type&quot; = 'closure'" symbol="3" key="{67af661e-65f1-44a7-9993-d5a668077b33}"/>
-          <rule filter="&quot;type&quot; = 'myciti'" symbol="4" key="{b99204cf-0adb-4656-90a9-4ae7d773a6f9}"/>
-          <rule filter="&quot;type&quot; = 'parking'" symbol="5" key="{96cc1758-d85e-4ed4-99e8-6e2730d07f11}"/>
+          <rule symbol="0" key="{efda7615-994b-459d-a657-ee8185286b0b}" filter="regexp_match( &quot;type&quot;, '(start|finish)')"/>
+          <rule symbol="1" key="{98bd58c0-fb3f-467c-aba3-c7ae911ad149}" filter="&quot;type&quot; = 'toilets'"/>
+          <rule symbol="2" key="{0d82fc83-a3cd-4068-9d3a-0fb004f8cfa5}" filter="&quot;type&quot; = 'togbag'"/>
+          <rule symbol="3" key="{67af661e-65f1-44a7-9993-d5a668077b33}" filter=" &quot;type&quot; = 'closure'"/>
+          <rule symbol="4" key="{b99204cf-0adb-4656-90a9-4ae7d773a6f9}" filter="&quot;type&quot; = 'myciti'"/>
+          <rule symbol="5" key="{96cc1758-d85e-4ed4-99e8-6e2730d07f11}" filter="&quot;type&quot; = 'parking'"/>
         </rules>
         <symbols>
-          <symbol is_animated="0" type="marker" name="0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="0,0,0,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="round" type="QString" name="joinstyle"/>
-                <Option value="star" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.5" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="7" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="0,0,0,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="round" name="joinstyle"/>
+                <Option type="QString" value="star" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.5" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="7" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -19383,47 +19385,47 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="size">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="if( @map_scale &lt; 7000, '14', '7' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="QString" value="if( @map_scale &lt; 7000, '14', '7' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" type="marker" name="1" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SvgMarker" enabled="1">
+            <layer locked="0" class="SvgMarker" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="0,32,80,255" type="QString" name="color"/>
-                <Option value="0" type="QString" name="fixedAspectRatio"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="amenity/amenity_toilets.svg" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="0" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="0,32,80,255" name="color"/>
+                <Option type="QString" value="0" name="fixedAspectRatio"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="amenity/amenity_toilets.svg" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                <Option type="QString" value="0" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
                 <Option name="parameters"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="7" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="7" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="color" v="0,32,80,255"/>
@@ -19445,47 +19447,47 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="size">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="if( @map_scale &lt; 7000, '10', '5' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="QString" value="if( @map_scale &lt; 7000, '10', '5' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" type="marker" name="2" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="2">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SvgMarker" enabled="1">
+            <layer locked="0" class="SvgMarker" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="0,0,0,255" type="QString" name="color"/>
-                <Option value="0" type="QString" name="fixedAspectRatio"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="../images/gym-bag.svg" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="0,0,0,255" name="color"/>
+                <Option type="QString" value="0" name="fixedAspectRatio"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="../images/gym-bag.svg" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
                 <Option name="parameters"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="6" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="6" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="color" v="0,0,0,255"/>
@@ -19507,57 +19509,57 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="fillColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="CASE&#xa;WHEN &quot;distance&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;distance&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;distance&quot; = '5KM'  THEN '#456419'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="CASE&#xa;WHEN &quot;distance&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;distance&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;distance&quot; = '5KM'  THEN '#456419'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="outlineColor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="size">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="if( @map_scale &lt; 7000, '10', '5' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="QString" value="if( @map_scale &lt; 7000, '10', '5' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" type="marker" name="3" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="3">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SvgMarker" enabled="1">
+            <layer locked="0" class="SvgMarker" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="125,139,143,255" type="QString" name="color"/>
-                <Option value="0" type="QString" name="fixedAspectRatio"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="../images/road_closure.svg" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="0" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="125,139,143,255" name="color"/>
+                <Option type="QString" value="0" name="fixedAspectRatio"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="../images/road_closure.svg" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                <Option type="QString" value="0" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
                 <Option name="parameters"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="6" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="6" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="color" v="125,139,143,255"/>
@@ -19579,47 +19581,47 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="size">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="if( @map_scale &lt; 7000, '10', '6' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="QString" value="if( @map_scale &lt; 7000, '10', '6' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" type="marker" name="4" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="4">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SvgMarker" enabled="1">
+            <layer locked="0" class="SvgMarker" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="0,12,254,255" type="QString" name="color"/>
-                <Option value="0" type="QString" name="fixedAspectRatio"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="transport/transport_bus_stop.svg" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="255,255,255,255" type="QString" name="outline_color"/>
-                <Option value="0" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="0,12,254,255" name="color"/>
+                <Option type="QString" value="0" name="fixedAspectRatio"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="transport/transport_bus_stop.svg" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="255,255,255,255" name="outline_color"/>
+                <Option type="QString" value="0" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
                 <Option name="parameters"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="5" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="5" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="color" v="0,12,254,255"/>
@@ -19642,18 +19644,18 @@ def my_form_open(dialog, layer, feature):
               <effect type="effectStack" enabled="0">
                 <effect type="dropShadow">
                   <Option type="Map">
-                    <Option value="13" type="QString" name="blend_mode"/>
-                    <Option value="2.645" type="QString" name="blur_level"/>
-                    <Option value="MM" type="QString" name="blur_unit"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="blur_unit_scale"/>
-                    <Option value="0,0,0,255" type="QString" name="color"/>
-                    <Option value="2" type="QString" name="draw_mode"/>
-                    <Option value="0" type="QString" name="enabled"/>
-                    <Option value="135" type="QString" name="offset_angle"/>
-                    <Option value="2" type="QString" name="offset_distance"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_unit_scale"/>
-                    <Option value="1" type="QString" name="opacity"/>
+                    <Option type="QString" value="13" name="blend_mode"/>
+                    <Option type="QString" value="2.645" name="blur_level"/>
+                    <Option type="QString" value="MM" name="blur_unit"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
+                    <Option type="QString" value="0,0,0,255" name="color"/>
+                    <Option type="QString" value="2" name="draw_mode"/>
+                    <Option type="QString" value="0" name="enabled"/>
+                    <Option type="QString" value="135" name="offset_angle"/>
+                    <Option type="QString" value="2" name="offset_distance"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_unit_scale"/>
+                    <Option type="QString" value="1" name="opacity"/>
                   </Option>
                   <prop k="blend_mode" v="13"/>
                   <prop k="blur_level" v="2.645"/>
@@ -19670,24 +19672,24 @@ def my_form_open(dialog, layer, feature):
                 </effect>
                 <effect type="outerGlow">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="blend_mode"/>
-                    <Option value="0.7935" type="QString" name="blur_level"/>
-                    <Option value="MM" type="QString" name="blur_unit"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="blur_unit_scale"/>
-                    <Option value="0,0,255,255" type="QString" name="color1"/>
-                    <Option value="0,255,0,255" type="QString" name="color2"/>
-                    <Option value="0" type="QString" name="color_type"/>
-                    <Option value="ccw" type="QString" name="direction"/>
-                    <Option value="0" type="QString" name="discrete"/>
-                    <Option value="2" type="QString" name="draw_mode"/>
-                    <Option value="1" type="QString" name="enabled"/>
-                    <Option value="0.5" type="QString" name="opacity"/>
-                    <Option value="gradient" type="QString" name="rampType"/>
-                    <Option value="255,255,255,255" type="QString" name="single_color"/>
-                    <Option value="rgb" type="QString" name="spec"/>
-                    <Option value="2" type="QString" name="spread"/>
-                    <Option value="MM" type="QString" name="spread_unit"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="spread_unit_scale"/>
+                    <Option type="QString" value="0" name="blend_mode"/>
+                    <Option type="QString" value="0.7935" name="blur_level"/>
+                    <Option type="QString" value="MM" name="blur_unit"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
+                    <Option type="QString" value="0,0,255,255" name="color1"/>
+                    <Option type="QString" value="0,255,0,255" name="color2"/>
+                    <Option type="QString" value="0" name="color_type"/>
+                    <Option type="QString" value="ccw" name="direction"/>
+                    <Option type="QString" value="0" name="discrete"/>
+                    <Option type="QString" value="2" name="draw_mode"/>
+                    <Option type="QString" value="1" name="enabled"/>
+                    <Option type="QString" value="0.5" name="opacity"/>
+                    <Option type="QString" value="gradient" name="rampType"/>
+                    <Option type="QString" value="255,255,255,255" name="single_color"/>
+                    <Option type="QString" value="rgb" name="spec"/>
+                    <Option type="QString" value="2" name="spread"/>
+                    <Option type="QString" value="MM" name="spread_unit"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="spread_unit_scale"/>
                   </Option>
                   <prop k="blend_mode" v="0"/>
                   <prop k="blur_level" v="0.7935"/>
@@ -19710,10 +19712,10 @@ def my_form_open(dialog, layer, feature):
                 </effect>
                 <effect type="drawSource">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="blend_mode"/>
-                    <Option value="2" type="QString" name="draw_mode"/>
-                    <Option value="1" type="QString" name="enabled"/>
-                    <Option value="1" type="QString" name="opacity"/>
+                    <Option type="QString" value="0" name="blend_mode"/>
+                    <Option type="QString" value="2" name="draw_mode"/>
+                    <Option type="QString" value="1" name="enabled"/>
+                    <Option type="QString" value="1" name="opacity"/>
                   </Option>
                   <prop k="blend_mode" v="0"/>
                   <prop k="draw_mode" v="2"/>
@@ -19722,18 +19724,18 @@ def my_form_open(dialog, layer, feature):
                 </effect>
                 <effect type="innerShadow">
                   <Option type="Map">
-                    <Option value="13" type="QString" name="blend_mode"/>
-                    <Option value="2.645" type="QString" name="blur_level"/>
-                    <Option value="MM" type="QString" name="blur_unit"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="blur_unit_scale"/>
-                    <Option value="0,0,0,255" type="QString" name="color"/>
-                    <Option value="2" type="QString" name="draw_mode"/>
-                    <Option value="0" type="QString" name="enabled"/>
-                    <Option value="135" type="QString" name="offset_angle"/>
-                    <Option value="2" type="QString" name="offset_distance"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_unit_scale"/>
-                    <Option value="1" type="QString" name="opacity"/>
+                    <Option type="QString" value="13" name="blend_mode"/>
+                    <Option type="QString" value="2.645" name="blur_level"/>
+                    <Option type="QString" value="MM" name="blur_unit"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
+                    <Option type="QString" value="0,0,0,255" name="color"/>
+                    <Option type="QString" value="2" name="draw_mode"/>
+                    <Option type="QString" value="0" name="enabled"/>
+                    <Option type="QString" value="135" name="offset_angle"/>
+                    <Option type="QString" value="2" name="offset_distance"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_unit_scale"/>
+                    <Option type="QString" value="1" name="opacity"/>
                   </Option>
                   <prop k="blend_mode" v="13"/>
                   <prop k="blur_level" v="2.645"/>
@@ -19750,24 +19752,24 @@ def my_form_open(dialog, layer, feature):
                 </effect>
                 <effect type="innerGlow">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="blend_mode"/>
-                    <Option value="0.7935" type="QString" name="blur_level"/>
-                    <Option value="MM" type="QString" name="blur_unit"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="blur_unit_scale"/>
-                    <Option value="0,0,255,255" type="QString" name="color1"/>
-                    <Option value="0,255,0,255" type="QString" name="color2"/>
-                    <Option value="0" type="QString" name="color_type"/>
-                    <Option value="ccw" type="QString" name="direction"/>
-                    <Option value="0" type="QString" name="discrete"/>
-                    <Option value="2" type="QString" name="draw_mode"/>
-                    <Option value="0" type="QString" name="enabled"/>
-                    <Option value="0.5" type="QString" name="opacity"/>
-                    <Option value="gradient" type="QString" name="rampType"/>
-                    <Option value="255,255,255,255" type="QString" name="single_color"/>
-                    <Option value="rgb" type="QString" name="spec"/>
-                    <Option value="2" type="QString" name="spread"/>
-                    <Option value="MM" type="QString" name="spread_unit"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="spread_unit_scale"/>
+                    <Option type="QString" value="0" name="blend_mode"/>
+                    <Option type="QString" value="0.7935" name="blur_level"/>
+                    <Option type="QString" value="MM" name="blur_unit"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="blur_unit_scale"/>
+                    <Option type="QString" value="0,0,255,255" name="color1"/>
+                    <Option type="QString" value="0,255,0,255" name="color2"/>
+                    <Option type="QString" value="0" name="color_type"/>
+                    <Option type="QString" value="ccw" name="direction"/>
+                    <Option type="QString" value="0" name="discrete"/>
+                    <Option type="QString" value="2" name="draw_mode"/>
+                    <Option type="QString" value="0" name="enabled"/>
+                    <Option type="QString" value="0.5" name="opacity"/>
+                    <Option type="QString" value="gradient" name="rampType"/>
+                    <Option type="QString" value="255,255,255,255" name="single_color"/>
+                    <Option type="QString" value="rgb" name="spec"/>
+                    <Option type="QString" value="2" name="spread"/>
+                    <Option type="QString" value="MM" name="spread_unit"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="spread_unit_scale"/>
                   </Option>
                   <prop k="blend_mode" v="0"/>
                   <prop k="blur_level" v="0.7935"/>
@@ -19791,47 +19793,47 @@ def my_form_open(dialog, layer, feature):
               </effect>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="size">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" type="marker" name="5" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="5">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SvgMarker" enabled="1">
+            <layer locked="0" class="SvgMarker" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="43,153,41,255" type="QString" name="color"/>
-                <Option value="0" type="QString" name="fixedAspectRatio"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="transport/amenity=parking.svg" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="0" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="43,153,41,255" name="color"/>
+                <Option type="QString" value="0" name="fixedAspectRatio"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="transport/amenity=parking.svg" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                <Option type="QString" value="0" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
                 <Option name="parameters"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="6" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="6" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="color" v="43,153,41,255"/>
@@ -19853,15 +19855,15 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="size">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="if( @map_scale &lt; 7000, '10', '5' )" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="QString" value="if( @map_scale &lt; 7000, '10', '5' )" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -19870,32 +19872,32 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="63" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="0.90000000000000002" fieldName="name" useSubstitutions="0" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="10" namedStyle="Semibold" forcedItalic="0" isExpression="0" fontSizeUnit="Point" allowHtml="0" legendString="Aa">
+          <text-style textOpacity="0.90000000000000002" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="Semibold" fontUnderline="0" fieldName="name" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" useSubstitutions="0" fontWeight="63" fontStrikeout="0" fontItalic="0" fontSize="10" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" isExpression="0" legendString="Aa" textOrientation="horizontal">
             <families/>
-            <text-buffer bufferNoFill="0" bufferBlendMode="0" bufferSize="2" bufferJoinStyle="128" bufferDraw="1" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="0.80000000000000004" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="0"/>
-            <background shapeRadiiY="2" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="1" shapeFillColor="255,255,255,255" shapeDraw="0" shapeBorderWidth="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="1" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="0.69999999999999996" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="2" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-              <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <text-buffer bufferNoFill="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="2" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="0.80000000000000004"/>
+            <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskType="0"/>
+            <background shapeRadiiY="2" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeSizeX="1" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="0.69999999999999996" shapeSizeY="1" shapeRadiiX="2">
+              <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                    <Option value="255,255,255,255" type="QString" name="color"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                    <Option value="no" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="solid" type="QString" name="style"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                    <Option type="QString" value="255,255,255,255" name="color"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                    <Option type="QString" value="no" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="solid" name="style"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -19910,99 +19912,99 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+            <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option type="Map" name="properties">
                   <Option type="Map" name="LabelDistance">
-                    <Option value="true" type="bool" name="active"/>
-                    <Option value="if( @map_scale &lt; 7000, '5', '3' )" type="QString" name="expression"/>
-                    <Option value="3" type="int" name="type"/>
+                    <Option type="bool" value="true" name="active"/>
+                    <Option type="QString" value="if( @map_scale &lt; 7000, '5', '3' )" name="expression"/>
+                    <Option type="int" value="3" name="type"/>
                   </Option>
                   <Option type="Map" name="OffsetQuad">
-                    <Option value="true" type="bool" name="active"/>
-                    <Option value="2" type="QString" name="expression"/>
-                    <Option value="3" type="int" name="type"/>
+                    <Option type="bool" value="true" name="active"/>
+                    <Option type="QString" value="2" name="expression"/>
+                    <Option type="int" value="3" name="type"/>
                   </Option>
                   <Option type="Map" name="Size">
-                    <Option value="true" type="bool" name="active"/>
-                    <Option value="if( @map_scale &lt; 7000, '14', '10' )" type="QString" name="expression"/>
-                    <Option value="3" type="int" name="type"/>
+                    <Option type="bool" value="true" name="active"/>
+                    <Option type="QString" value="if( @map_scale &lt; 7000, '14', '10' )" name="expression"/>
+                    <Option type="int" value="3" name="type"/>
                   </Option>
                 </Option>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format useMaxLineLengthForAutoWrap="1" leftDirectionSymbol="&lt;" wrapChar="" multilineAlign="3" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" decimals="3" rightDirectionSymbol=">" formatNumbers="0"/>
-          <placement overlapHandling="AllowOverlapIfRequired" lineAnchorType="0" centroidInside="0" overrunDistance="0" centroidWhole="0" geometryGeneratorEnabled="0" rotationAngle="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" geometryGeneratorType="PointGeometry" quadOffset="2" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="0" xOffset="2" allowDegraded="1" lineAnchorTextPoint="CenterOfText" layerType="UnknownGeometry" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" maxCurvedCharAngleOut="-25" repeatDistance="0" offsetUnits="MM" repeatDistanceUnits="MM" dist="3" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" distUnits="MM" lineAnchorClipping="0" placementFlags="10" priority="10" overrunDistanceUnit="MM" maxCurvedCharAngleIn="25" geometryGenerator="" lineAnchorPercent="0.5" yOffset="3" rotationUnit="AngleDegrees"/>
-          <rendering fontMaxPixelSize="10000" drawLabels="1" mergeLines="0" zIndex="10" upsidedownLabels="0" obstacleFactor="1.8" scaleVisibility="0" limitNumLabels="0" obstacleType="0" fontLimitPixelSize="0" maxNumLabels="2000" minFeatureSize="0" fontMinPixelSize="3" labelPerPart="0" obstacle="1" scaleMax="0" scaleMin="0" unplacedVisibility="0"/>
+          <text-format wrapChar="" rightDirectionSymbol=">" plussign="0" leftDirectionSymbol="&lt;" formatNumbers="0" decimals="3" multilineAlign="3" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
+          <placement offsetUnits="MM" xOffset="2" maxCurvedCharAngleOut="-25" layerType="UnknownGeometry" allowDegraded="1" yOffset="3" overlapHandling="AllowOverlapIfRequired" geometryGeneratorType="PointGeometry" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" repeatDistanceUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25" quadOffset="2" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidWhole="0" overrunDistance="0" overrunDistanceUnit="MM" centroidInside="0" placement="0" geometryGenerator="" priority="10" distUnits="MM" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" dist="3" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorTextPoint="CenterOfText" polygonPlacementFlags="2" rotationUnit="AngleDegrees" offsetType="0" placementFlags="10" repeatDistance="0"/>
+          <rendering limitNumLabels="0" obstacleType="0" obstacle="1" scaleMax="0" maxNumLabels="2000" labelPerPart="0" scaleMin="0" upsidedownLabels="0" zIndex="10" unplacedVisibility="0" fontLimitPixelSize="0" minFeatureSize="0" fontMaxPixelSize="10000" scaleVisibility="0" fontMinPixelSize="3" drawLabels="1" mergeLines="0" obstacleFactor="1.8"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="LabelDistance">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="if( @map_scale &lt; 7000, '5', '3' )" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="if( @map_scale &lt; 7000, '5', '3' )" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
                 <Option type="Map" name="OffsetQuad">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="2" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="2" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
                 <Option type="Map" name="Size">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="if( @map_scale &lt; 7000, '14', '10' )" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="if( @map_scale &lt; 7000, '14', '10' )" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-              <Option value="0" type="int" name="blendMode"/>
+              <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+              <Option type="int" value="0" name="blendMode"/>
               <Option type="Map" name="ddProperties">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
-              <Option value="false" type="bool" name="drawToAllParts"/>
-              <Option value="0" type="QString" name="enabled"/>
-              <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-              <Option value="&lt;symbol is_animated=&quot;0&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-              <Option value="0" type="double" name="minLength"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-              <Option value="MM" type="QString" name="minLengthUnit"/>
-              <Option value="0" type="double" name="offsetFromAnchor"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-              <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-              <Option value="0" type="double" name="offsetFromLabel"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-              <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+              <Option type="bool" value="false" name="drawToAllParts"/>
+              <Option type="QString" value="0" name="enabled"/>
+              <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
+              <Option type="QString" value="&lt;symbol alpha=&quot;1&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
+              <Option type="double" value="0" name="minLength"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
+              <Option type="QString" value="MM" name="minLengthUnit"/>
+              <Option type="double" value="0" name="offsetFromAnchor"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
+              <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
+              <Option type="double" value="0" name="offsetFromLabel"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
+              <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option value="id" type="QString" name="dualview/previewExpressions"/>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="QString" value="copy" name="QFieldSync/action"/>
+          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="id" name="dualview/previewExpressions"/>
+          <Option type="QString" value="0" name="embeddedWidgets/count"/>
           <Option type="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -20010,48 +20012,48 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory penAlpha="255" width="15" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" minimumSize="0" enabled="0" maxScaleDenominator="1e+08" diagramOrientation="Up" opacity="1" scaleBasedVisibility="0" spacingUnit="MM" minScaleDenominator="0" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" lineSizeType="MM" penWidth="0" backgroundAlpha="255" scaleDependency="Area" spacing="0" direction="1" barWidth="5" sizeType="MM" height="15" penColor="#000000" showAxis="0">
-          <fontProperties bold="0" style="0" italic="1" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" strikethrough="0"/>
-          <attribute label="" colorOpacity="1" field="" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory height="15" scaleDependency="Area" width="15" lineSizeScale="3x:0,0,0,0,0,0" spacingUnit="MM" lineSizeType="MM" penColor="#000000" spacing="0" labelPlacementMethod="XHeight" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" backgroundAlpha="255" maxScaleDenominator="1e+08" barWidth="5" penWidth="0" minimumSize="0" penAlpha="255" minScaleDenominator="0" sizeType="MM" backgroundColor="#ffffff" enabled="0" opacity="1" direction="1" scaleBasedVisibility="0" showAxis="0" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270">
+          <fontProperties style="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" strikethrough="0" italic="1" underline="0" bold="0"/>
+          <attribute color="#000000" field="" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="35,35,35,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0.26" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -20082,9 +20084,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -20092,20 +20094,20 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" showAll="1" placement="0" zIndex="0" dist="0" priority="0" obstacle="0">
+      <DiagramLayerSettings priority="0" linePlacementFlags="18" obstacle="0" dist="0" zIndex="0" placement="0" showAll="1">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field configurationFlags="None" name="id">
@@ -20138,40 +20140,40 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
-        <alias index="1" name="" field="type"/>
-        <alias index="2" name="" field="name"/>
-        <alias index="3" name="" field="distance"/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="type" name=""/>
+        <alias index="2" field="name" name=""/>
+        <alias index="3" field="distance" name=""/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="type"/>
-        <default applyOnUpdate="0" expression="" field="name"/>
-        <default applyOnUpdate="0" expression="" field="distance"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="type" expression=""/>
+        <default applyOnUpdate="0" field="name" expression=""/>
+        <default applyOnUpdate="0" field="distance" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="id" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="type" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="name" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="distance" constraints="0"/>
+        <constraint exp_strength="0" field="id" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="type" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="name" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="distance" notnull_strength="0" constraints="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" desc="" field="id"/>
-        <constraint exp="" desc="" field="type"/>
-        <constraint exp="" desc="" field="name"/>
-        <constraint exp="" desc="" field="distance"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="type" desc=""/>
+        <constraint exp="" field="name" desc=""/>
+        <constraint exp="" field="distance" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="&quot;type&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="&quot;type&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column width="-1" type="field" name="id" hidden="0"/>
-          <column width="-1" type="field" name="type" hidden="0"/>
+          <column width="-1" type="field" hidden="0" name="id"/>
+          <column width="-1" type="field" hidden="0" name="type"/>
           <column width="-1" type="actions" hidden="1"/>
-          <column width="-1" type="field" name="name" hidden="0"/>
-          <column width="-1" type="field" name="distance" hidden="0"/>
+          <column width="-1" type="field" hidden="0" name="name"/>
+          <column width="-1" type="field" hidden="0" name="distance"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -20203,16 +20205,16 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="distance" editable="1"/>
-        <field name="id" editable="1"/>
-        <field name="name" editable="1"/>
-        <field name="type" editable="1"/>
+        <field editable="1" name="distance"/>
+        <field editable="1" name="id"/>
+        <field editable="1" name="name"/>
+        <field editable="1" name="type"/>
       </editable>
       <labelOnTop>
-        <field name="distance" labelOnTop="0"/>
-        <field name="id" labelOnTop="0"/>
-        <field name="name" labelOnTop="0"/>
-        <field name="type" labelOnTop="0"/>
+        <field labelOnTop="0" name="distance"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="name"/>
+        <field labelOnTop="0" name="type"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -20220,7 +20222,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" simplifyLocal="1" autoRefreshTime="0" wkbType="MultiPolygon" simplifyDrawingHints="1" type="vector" symbologyReferenceScale="-1" minScale="100000000" legendPlaceholderImage="" refreshOnNotifyEnabled="0" labelsEnabled="0" maxScale="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" refreshOnNotifyMessage="" readOnly="0" geometry="Polygon" autoRefreshEnabled="0" simplifyDrawingTol="1">
+    <maplayer simplifyLocal="1" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1" legendPlaceholderImage="" symbologyReferenceScale="-1" readOnly="0" refreshOnNotifyEnabled="0" minScale="100000000" maxScale="0" type="vector" autoRefreshTime="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="0" styleCategories="AllStyleCategories" geometry="Polygon" autoRefreshEnabled="0" wkbType="MultiPolygon">
       <extent>
         <xmin>18.37312291788339991</xmin>
         <ymin>-33.931815589166888</ymin>
@@ -20293,58 +20295,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" startExpression="" mode="0" limitMode="0" endField="" fixedDuration="0" accumulate="0" durationUnit="min" startField="" endExpression="" enabled="0">
+      <temporal durationField="" fixedDuration="0" accumulate="0" endField="" startField="" enabled="0" startExpression="" endExpression="" durationUnit="min" mode="0" limitMode="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" zscale="1" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" binding="Centroid" type="IndividualFeatures" symbology="Line" extrusion="0" zoffset="0">
+      <elevation extrusionEnabled="0" symbology="Line" type="IndividualFeatures" zscale="1" clamping="Terrain" showMarkerSymbolInSurfacePlots="0" zoffset="0" extrusion="0" respectLayerSymbol="1" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="152,125,183,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="152,125,183,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -20375,36 +20377,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="152,125,183,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="109,89,131,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="152,125,183,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="109,89,131,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="152,125,183,255"/>
@@ -20419,44 +20421,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="152,125,183,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="109,89,131,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="152,125,183,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="diamond" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="109,89,131,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="3" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -20479,42 +20481,42 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" type="singleSymbol" symbollevels="0" referencescale="-1" enableorderby="0">
+      <renderer-v2 enableorderby="0" type="singleSymbol" symbollevels="0" referencescale="-1" forceraster="0">
         <symbols>
-          <symbol is_animated="0" type="fill" name="0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="LinePatternFill" enabled="1">
+            <layer locked="0" class="LinePatternFill" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="135" type="QString" name="angle"/>
-                <Option value="during_render" type="QString" name="clip_mode"/>
-                <Option value="211,134,33,255" type="QString" name="color"/>
-                <Option value="feature" type="QString" name="coordinate_reference"/>
-                <Option value="2" type="QString" name="distance"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="distance_map_unit_scale"/>
-                <Option value="MM" type="QString" name="distance_unit"/>
-                <Option value="0.26" type="QString" name="line_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="line_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
+                <Option type="QString" value="135" name="angle"/>
+                <Option type="QString" value="during_render" name="clip_mode"/>
+                <Option type="QString" value="211,134,33,255" name="color"/>
+                <Option type="QString" value="feature" name="coordinate_reference"/>
+                <Option type="QString" value="2" name="distance"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="distance_map_unit_scale"/>
+                <Option type="QString" value="MM" name="distance_unit"/>
+                <Option type="QString" value="0.26" name="line_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="line_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
               </Option>
               <prop k="angle" v="135"/>
               <prop k="clip_mode" v="during_render"/>
@@ -20533,48 +20535,48 @@ def my_form_open(dialog, layer, feature):
               <prop k="outline_width_unit" v="MM"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" type="line" name="@0@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+              <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@0@0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+                <layer locked="0" class="SimpleLine" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="align_dash_pattern"/>
-                    <Option value="square" type="QString" name="capstyle"/>
-                    <Option value="5;2" type="QString" name="customdash"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="customdash_unit"/>
-                    <Option value="0" type="QString" name="dash_pattern_offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                    <Option value="0" type="QString" name="draw_inside_polygon"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="211,134,33,255" type="QString" name="line_color"/>
-                    <Option value="solid" type="QString" name="line_style"/>
-                    <Option value="0.3" type="QString" name="line_width"/>
-                    <Option value="MM" type="QString" name="line_width_unit"/>
-                    <Option value="0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0" type="QString" name="ring_filter"/>
-                    <Option value="0" type="QString" name="trim_distance_end"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                    <Option value="0" type="QString" name="trim_distance_start"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                    <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                    <Option value="0" type="QString" name="use_custom_dash"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                    <Option type="QString" value="0" name="align_dash_pattern"/>
+                    <Option type="QString" value="square" name="capstyle"/>
+                    <Option type="QString" value="5;2" name="customdash"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="customdash_unit"/>
+                    <Option type="QString" value="0" name="dash_pattern_offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                    <Option type="QString" value="0" name="draw_inside_polygon"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="211,134,33,255" name="line_color"/>
+                    <Option type="QString" value="solid" name="line_style"/>
+                    <Option type="QString" value="0.3" name="line_width"/>
+                    <Option type="QString" value="MM" name="line_width_unit"/>
+                    <Option type="QString" value="0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="0" name="ring_filter"/>
+                    <Option type="QString" value="0" name="trim_distance_end"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                    <Option type="QString" value="0" name="trim_distance_start"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                    <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                    <Option type="QString" value="0" name="use_custom_dash"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                   </Option>
                   <prop k="align_dash_pattern" v="0"/>
                   <prop k="capstyle" v="square"/>
@@ -20605,27 +20607,27 @@ def my_form_open(dialog, layer, feature):
                   <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="211,134,33,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.46" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="no" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="211,134,33,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.46" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="no" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="211,134,33,255"/>
@@ -20640,9 +20642,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="no"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -20653,11 +20655,11 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option value="id" type="QString" name="dualview/previewExpressions"/>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="QString" value="copy" name="QFieldSync/action"/>
+          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="id" name="dualview/previewExpressions"/>
+          <Option type="QString" value="0" name="embeddedWidgets/count"/>
           <Option type="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -20665,48 +20667,48 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory penAlpha="255" width="15" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" minimumSize="0" enabled="0" maxScaleDenominator="1e+08" diagramOrientation="Up" opacity="1" scaleBasedVisibility="0" spacingUnit="MM" minScaleDenominator="0" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" lineSizeType="MM" penWidth="0" backgroundAlpha="255" scaleDependency="Area" spacing="0" direction="1" barWidth="5" sizeType="MM" height="15" penColor="#000000" showAxis="0">
-          <fontProperties bold="0" style="0" italic="1" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" strikethrough="0"/>
-          <attribute label="" colorOpacity="1" field="" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory height="15" scaleDependency="Area" width="15" lineSizeScale="3x:0,0,0,0,0,0" spacingUnit="MM" lineSizeType="MM" penColor="#000000" spacing="0" labelPlacementMethod="XHeight" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" backgroundAlpha="255" maxScaleDenominator="1e+08" barWidth="5" penWidth="0" minimumSize="0" penAlpha="255" minScaleDenominator="0" sizeType="MM" backgroundColor="#ffffff" enabled="0" opacity="1" direction="1" scaleBasedVisibility="0" showAxis="0" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270">
+          <fontProperties style="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" strikethrough="0" italic="1" underline="0" bold="0"/>
+          <attribute color="#000000" field="" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="35,35,35,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0.26" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -20737,9 +20739,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -20747,20 +20749,20 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" showAll="1" placement="1" zIndex="0" dist="0" priority="0" obstacle="0">
+      <DiagramLayerSettings priority="0" linePlacementFlags="18" obstacle="0" dist="0" zIndex="0" placement="1" showAll="1">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field configurationFlags="None" name="FID">
@@ -20772,25 +20774,25 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="FID"/>
+        <alias index="0" field="FID" name=""/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="FID"/>
+        <default applyOnUpdate="0" field="FID" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="FID" constraints="0"/>
+        <constraint exp_strength="0" field="FID" notnull_strength="0" constraints="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" desc="" field="FID"/>
+        <constraint exp="" field="FID" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column width="-1" type="field" name="id" hidden="0"/>
-          <column width="431" type="field" name="type" hidden="0"/>
+          <column width="-1" type="field" hidden="0" name="id"/>
+          <column width="431" type="field" hidden="0" name="type"/>
           <column width="-1" type="actions" hidden="1"/>
         </columns>
       </attributetableconfig>
@@ -20823,12 +20825,12 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="id" editable="1"/>
-        <field name="type" editable="1"/>
+        <field editable="1" name="id"/>
+        <field editable="1" name="type"/>
       </editable>
       <labelOnTop>
-        <field name="id" labelOnTop="0"/>
-        <field name="type" labelOnTop="0"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="type"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -20836,7 +20838,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" simplifyLocal="1" autoRefreshTime="0" wkbType="MultiLineString" simplifyDrawingHints="1" type="vector" symbologyReferenceScale="-1" minScale="100000000" legendPlaceholderImage="" refreshOnNotifyEnabled="0" labelsEnabled="1" maxScale="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" refreshOnNotifyMessage="" readOnly="0" geometry="Line" autoRefreshEnabled="0" simplifyDrawingTol="1">
+    <maplayer simplifyLocal="1" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1" legendPlaceholderImage="" symbologyReferenceScale="-1" readOnly="0" refreshOnNotifyEnabled="0" minScale="100000000" maxScale="0" type="vector" autoRefreshTime="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="1" styleCategories="AllStyleCategories" geometry="Line" autoRefreshEnabled="0" wkbType="MultiLineString">
       <extent>
         <xmin>18.3752895999999879</xmin>
         <ymin>-33.94589500000000726</ymin>
@@ -20901,7 +20903,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxy="0" minz="0" dimensions="2" maxx="0" maxz="0" miny="0" minx="0" crs=""/>
+          <spatial maxz="0" minx="0" maxx="0" minz="0" crs="" miny="0" maxy="0" dimensions="2"/>
           <temporal>
             <period>
               <start></start>
@@ -20926,58 +20928,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" startExpression="" mode="0" limitMode="0" endField="" fixedDuration="0" accumulate="0" durationUnit="min" startField="" endExpression="" enabled="0">
+      <temporal durationField="" fixedDuration="0" accumulate="0" endField="" startField="" enabled="0" startExpression="" endExpression="" durationUnit="min" mode="0" limitMode="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" zscale="1" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" binding="Centroid" type="IndividualFeatures" symbology="Line" extrusion="0" zoffset="0">
+      <elevation extrusionEnabled="0" symbology="Line" type="IndividualFeatures" zscale="1" clamping="Terrain" showMarkerSymbolInSurfacePlots="0" zoffset="0" extrusion="0" respectLayerSymbol="1" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="190,207,80,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="190,207,80,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -21008,36 +21010,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="190,207,80,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="136,148,57,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="190,207,80,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="136,148,57,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="190,207,80,255"/>
@@ -21052,44 +21054,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="190,207,80,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="136,148,57,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="190,207,80,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="diamond" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="136,148,57,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="3" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -21112,61 +21114,61 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" type="RuleRenderer" symbollevels="0" referencescale="-1" enableorderby="0">
+      <renderer-v2 enableorderby="0" type="RuleRenderer" symbollevels="0" referencescale="-1" forceraster="0">
         <rules key="{57366f52-c504-4c9a-800f-dcbf1d415bf6}">
-          <rule filter="&quot;status&quot; = 'open'" symbol="0" label="Road Open" key="{1a55e945-61ef-4ec7-9d47-aa181d9fba9f}"/>
-          <rule filter="&quot;status&quot; = 'no-parking'" symbol="1" label="No Parking" key="{bb8770a2-ebd2-4359-9d1d-9ebbb7fadbfa}"/>
-          <rule filter="&quot;status&quot; = 'lane-closed'" symbol="2" label="Lane Closed" key="{141a0163-d939-4e3f-adf2-645a4b477d1a}"/>
-          <rule filter="&quot;status&quot; = 'one-way'" symbol="3" label="One-Way" key="{fff6dd36-b1a4-45e3-bfba-e41cc7bef314}"/>
-          <rule filter="&quot;status&quot; = 'closure'" symbol="4" label="Road Closures" key="{c145ac1f-246c-492e-a3fe-5817271a80c4}"/>
+          <rule symbol="0" label="Road Open" key="{1a55e945-61ef-4ec7-9d47-aa181d9fba9f}" filter="&quot;status&quot; = 'open'"/>
+          <rule symbol="1" label="No Parking" key="{bb8770a2-ebd2-4359-9d1d-9ebbb7fadbfa}" filter="&quot;status&quot; = 'no-parking'"/>
+          <rule symbol="2" label="Lane Closed" key="{141a0163-d939-4e3f-adf2-645a4b477d1a}" filter="&quot;status&quot; = 'lane-closed'"/>
+          <rule symbol="3" label="One-Way" key="{fff6dd36-b1a4-45e3-bfba-e41cc7bef314}" filter="&quot;status&quot; = 'one-way'"/>
+          <rule symbol="4" label="Road Closures" key="{c145ac1f-246c-492e-a3fe-5817271a80c4}" filter="&quot;status&quot; = 'closure'"/>
         </rules>
         <symbols>
-          <symbol is_animated="0" type="line" name="0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,255,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.75" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,255,0,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.75" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -21197,50 +21199,50 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="outlineStyle">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" type="line" name="1" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="2" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="Interval" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="2" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="Interval" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -21260,40 +21262,40 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" type="marker" name="@1@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+              <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@1@0">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="255,255,255,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="circle" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="0,255,0,255" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0.5" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="1" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="square" name="cap_style"/>
+                    <Option type="QString" value="255,255,255,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="circle" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="0,255,0,255" name="outline_color"/>
+                    <Option type="QString" value="solid" name="outline_style"/>
+                    <Option type="QString" value="0.5" name="outline_width"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="1" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -21316,52 +21318,52 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol is_animated="0" type="line" name="2" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="2">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="2;1;1;1" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,255,0,255" type="QString" name="line_color"/>
-                <Option value="dash dot dot" type="QString" name="line_style"/>
-                <Option value="0.75" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="1" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="2;1;1;1" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,255,0,255" name="line_color"/>
+                <Option type="QString" value="dash dot dot" name="line_style"/>
+                <Option type="QString" value="0.75" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="1" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -21392,41 +21394,41 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="outlineStyle">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="250" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="25" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="Interval" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="250" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="25" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="Interval" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -21446,46 +21448,46 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="enabled">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" type="marker" name="@2@1" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+              <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@2@1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="0,255,0,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="35,35,35,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="3.5" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="square" name="cap_style"/>
+                    <Option type="QString" value="0,255,0,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="filled_arrowhead" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="35,35,35,0" name="outline_color"/>
+                    <Option type="QString" value="solid" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="3.5" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -21508,58 +21510,58 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="outlineStyle">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="int" value="1" name="type"/>
+                          <Option type="QString" value="" name="val"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol is_animated="0" type="line" name="3" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="3">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="3;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,255,0,255" type="QString" name="line_color"/>
-                <Option value="dash" type="QString" name="line_style"/>
-                <Option value="0.75" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="1" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="3;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,255,0,255" name="line_color"/>
+                <Option type="QString" value="dash" name="line_style"/>
+                <Option type="QString" value="0.75" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="1" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -21590,41 +21592,41 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="outlineStyle">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="250" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="25" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MapUnit" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="Interval" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="250" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="25" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MapUnit" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="Interval" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -21644,46 +21646,46 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="enabled">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" type="marker" name="@3@1" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+              <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@3@1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="square" type="QString" name="cap_style"/>
-                    <Option value="0,255,0,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="35,35,35,0" type="QString" name="outline_color"/>
-                    <Option value="solid" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="3.5" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="square" name="cap_style"/>
+                    <Option type="QString" value="0,255,0,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="filled_arrowhead" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="35,35,35,0" name="outline_color"/>
+                    <Option type="QString" value="solid" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="3.5" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="cap_style" v="square"/>
@@ -21706,58 +21708,58 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="outlineStyle">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="int" value="1" name="type"/>
+                          <Option type="QString" value="" name="val"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
           </symbol>
-          <symbol is_animated="0" type="line" name="4" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="4">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="255,0,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.75" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="255,0,0,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.75" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -21788,20 +21790,20 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="outlineColor">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="outlineStyle">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -21810,32 +21812,32 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="50" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="1" fieldName="times" useSubstitutions="0" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="9" namedStyle="Regular" forcedItalic="0" isExpression="0" fontSizeUnit="Point" allowHtml="0" legendString="Aa">
+          <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="Regular" fontUnderline="0" fieldName="times" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" useSubstitutions="0" fontWeight="50" fontStrikeout="0" fontItalic="0" fontSize="9" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" isExpression="0" legendString="Aa" textOrientation="horizontal">
             <families/>
-            <text-buffer bufferNoFill="1" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferDraw="1" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="0"/>
-            <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeBorderWidth="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-              <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <text-buffer bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+            <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskType="0"/>
+            <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
+              <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                    <Option value="255,255,255,255" type="QString" name="color"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                    <Option value="no" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="solid" type="QString" name="style"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                    <Option type="QString" value="255,255,255,255" name="color"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                    <Option type="QString" value="no" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="solid" name="style"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -21850,67 +21852,67 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+            <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format useMaxLineLengthForAutoWrap="1" leftDirectionSymbol="&lt;" wrapChar="" multilineAlign="4294967295" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" decimals="3" rightDirectionSymbol=">" formatNumbers="0"/>
-          <placement overlapHandling="PreventOverlap" lineAnchorType="0" centroidInside="0" overrunDistance="0" centroidWhole="0" geometryGeneratorEnabled="0" rotationAngle="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" geometryGeneratorType="PointGeometry" quadOffset="4" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="2" xOffset="0" allowDegraded="0" lineAnchorTextPoint="CenterOfText" layerType="UnknownGeometry" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" maxCurvedCharAngleOut="-25" repeatDistance="0" offsetUnits="MM" repeatDistanceUnits="MM" dist="0" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" distUnits="MM" lineAnchorClipping="0" placementFlags="10" priority="5" overrunDistanceUnit="MM" maxCurvedCharAngleIn="25" geometryGenerator="" lineAnchorPercent="0.5" yOffset="0" rotationUnit="AngleDegrees"/>
-          <rendering fontMaxPixelSize="10000" drawLabels="1" mergeLines="0" zIndex="0" upsidedownLabels="0" obstacleFactor="1" scaleVisibility="0" limitNumLabels="0" obstacleType="0" fontLimitPixelSize="0" maxNumLabels="2000" minFeatureSize="0" fontMinPixelSize="3" labelPerPart="0" obstacle="1" scaleMax="0" scaleMin="0" unplacedVisibility="0"/>
+          <text-format wrapChar="" rightDirectionSymbol=">" plussign="0" leftDirectionSymbol="&lt;" formatNumbers="0" decimals="3" multilineAlign="4294967295" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
+          <placement offsetUnits="MM" xOffset="0" maxCurvedCharAngleOut="-25" layerType="UnknownGeometry" allowDegraded="0" yOffset="0" overlapHandling="PreventOverlap" geometryGeneratorType="PointGeometry" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" repeatDistanceUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25" quadOffset="4" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidWhole="0" overrunDistance="0" overrunDistanceUnit="MM" centroidInside="0" placement="2" geometryGenerator="" priority="5" distUnits="MM" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" dist="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorTextPoint="CenterOfText" polygonPlacementFlags="2" rotationUnit="AngleDegrees" offsetType="0" placementFlags="10" repeatDistance="0"/>
+          <rendering limitNumLabels="0" obstacleType="0" obstacle="1" scaleMax="0" maxNumLabels="2000" labelPerPart="0" scaleMin="0" upsidedownLabels="0" zIndex="0" unplacedVisibility="0" fontLimitPixelSize="0" minFeatureSize="0" fontMaxPixelSize="10000" scaleVisibility="0" fontMinPixelSize="3" drawLabels="1" mergeLines="0" obstacleFactor="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-              <Option value="0" type="int" name="blendMode"/>
+              <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+              <Option type="int" value="0" name="blendMode"/>
               <Option type="Map" name="ddProperties">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
-              <Option value="false" type="bool" name="drawToAllParts"/>
-              <Option value="0" type="QString" name="enabled"/>
-              <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-              <Option value="&lt;symbol is_animated=&quot;0&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-              <Option value="0" type="double" name="minLength"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-              <Option value="MM" type="QString" name="minLengthUnit"/>
-              <Option value="0" type="double" name="offsetFromAnchor"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-              <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-              <Option value="0" type="double" name="offsetFromLabel"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-              <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+              <Option type="bool" value="false" name="drawToAllParts"/>
+              <Option type="QString" value="0" name="enabled"/>
+              <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
+              <Option type="QString" value="&lt;symbol alpha=&quot;1&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
+              <Option type="double" value="0" name="minLength"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
+              <Option type="QString" value="MM" name="minLengthUnit"/>
+              <Option type="double" value="0" name="offsetFromAnchor"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
+              <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
+              <Option type="double" value="0" name="offsetFromLabel"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
+              <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option value="id" type="QString" name="dualview/previewExpressions"/>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="QString" value="copy" name="QFieldSync/action"/>
+          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="id" name="dualview/previewExpressions"/>
+          <Option type="QString" value="0" name="embeddedWidgets/count"/>
           <Option type="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -21918,48 +21920,48 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory penAlpha="255" width="15" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" minimumSize="0" enabled="0" maxScaleDenominator="1e+08" diagramOrientation="Up" opacity="1" scaleBasedVisibility="0" spacingUnit="MM" minScaleDenominator="0" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" lineSizeType="MM" penWidth="0" backgroundAlpha="255" scaleDependency="Area" spacing="0" direction="1" barWidth="5" sizeType="MM" height="15" penColor="#000000" showAxis="0">
-          <fontProperties bold="0" style="0" italic="1" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" strikethrough="0"/>
-          <attribute label="" colorOpacity="1" field="" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory height="15" scaleDependency="Area" width="15" lineSizeScale="3x:0,0,0,0,0,0" spacingUnit="MM" lineSizeType="MM" penColor="#000000" spacing="0" labelPlacementMethod="XHeight" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" backgroundAlpha="255" maxScaleDenominator="1e+08" barWidth="5" penWidth="0" minimumSize="0" penAlpha="255" minScaleDenominator="0" sizeType="MM" backgroundColor="#ffffff" enabled="0" opacity="1" direction="1" scaleBasedVisibility="0" showAxis="0" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270">
+          <fontProperties style="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" strikethrough="0" italic="1" underline="0" bold="0"/>
+          <attribute color="#000000" field="" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="35,35,35,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0.26" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -21990,9 +21992,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -22000,20 +22002,20 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" showAll="1" placement="2" zIndex="0" dist="0" priority="0" obstacle="0">
+      <DiagramLayerSettings priority="0" linePlacementFlags="18" obstacle="0" dist="0" zIndex="0" placement="2" showAll="1">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field configurationFlags="None" name="id">
@@ -22046,40 +22048,40 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
-        <alias index="1" name="" field="type"/>
-        <alias index="2" name="" field="status"/>
-        <alias index="3" name="" field="times"/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="type" name=""/>
+        <alias index="2" field="status" name=""/>
+        <alias index="3" field="times" name=""/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="type"/>
-        <default applyOnUpdate="0" expression="" field="status"/>
-        <default applyOnUpdate="0" expression="" field="times"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="type" expression=""/>
+        <default applyOnUpdate="0" field="status" expression=""/>
+        <default applyOnUpdate="0" field="times" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="id" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="type" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="status" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="times" constraints="0"/>
+        <constraint exp_strength="0" field="id" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="type" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="status" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="times" notnull_strength="0" constraints="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" desc="" field="id"/>
-        <constraint exp="" desc="" field="type"/>
-        <constraint exp="" desc="" field="status"/>
-        <constraint exp="" desc="" field="times"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="type" desc=""/>
+        <constraint exp="" field="status" desc=""/>
+        <constraint exp="" field="times" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="&quot;id&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="&quot;id&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column width="-1" type="field" name="id" hidden="0"/>
-          <column width="202" type="field" name="type" hidden="0"/>
+          <column width="-1" type="field" hidden="0" name="id"/>
+          <column width="202" type="field" hidden="0" name="type"/>
           <column width="-1" type="actions" hidden="1"/>
-          <column width="-1" type="field" name="status" hidden="0"/>
-          <column width="-1" type="field" name="times" hidden="0"/>
+          <column width="-1" type="field" hidden="0" name="status"/>
+          <column width="-1" type="field" hidden="0" name="times"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -22111,16 +22113,16 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="id" editable="1"/>
-        <field name="status" editable="1"/>
-        <field name="times" editable="1"/>
-        <field name="type" editable="1"/>
+        <field editable="1" name="id"/>
+        <field editable="1" name="status"/>
+        <field editable="1" name="times"/>
+        <field editable="1" name="type"/>
       </editable>
       <labelOnTop>
-        <field name="id" labelOnTop="0"/>
-        <field name="status" labelOnTop="0"/>
-        <field name="times" labelOnTop="0"/>
-        <field name="type" labelOnTop="0"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="status"/>
+        <field labelOnTop="0" name="times"/>
+        <field labelOnTop="0" name="type"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -22128,20 +22130,20 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" simplifyLocal="1" autoRefreshTime="0" wkbType="Point" simplifyDrawingHints="0" type="vector" symbologyReferenceScale="-1" minScale="100000000" legendPlaceholderImage="" refreshOnNotifyEnabled="0" labelsEnabled="1" maxScale="100000" styleCategories="AllStyleCategories" simplifyAlgorithm="0" refreshOnNotifyMessage="" readOnly="0" geometry="Point" autoRefreshEnabled="0" simplifyDrawingTol="1">
+    <maplayer simplifyLocal="1" simplifyDrawingHints="0" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1" legendPlaceholderImage="" symbologyReferenceScale="-1" readOnly="0" refreshOnNotifyEnabled="0" minScale="100000000" maxScale="100000" type="vector" autoRefreshTime="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="1" styleCategories="AllStyleCategories" geometry="Point" autoRefreshEnabled="0" wkbType="Point">
       <extent>
-        <xmin>18.37568241336308006</xmin>
+        <xmin>18.37568931513334292</xmin>
         <ymin>-33.95582126985814853</ymin>
         <xmax>18.42275999405387665</xmax>
         <ymax>-33.8998161888264562</ymax>
       </extent>
       <wgs84extent>
-        <xmin>18.37568241336308006</xmin>
+        <xmin>18.37568931513334292</xmin>
         <ymin>-33.95582126985814853</ymin>
         <xmax>18.42275999405387665</xmax>
         <ymax>-33.8998161888264562</ymax>
       </wgs84extent>
-      <id>route_markers_d58f7174_b6d0_4e1c_80ed_0d74635b8ca6</id>
+      <id>route_markers_4e92bf25_f500_4b5f_bf49_9dd0b475a0c9</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>
@@ -22167,6 +22169,15 @@ def my_form_open(dialog, layer, feature):
         <type></type>
         <title></title>
         <abstract></abstract>
+        <contact>
+          <name></name>
+          <organization></organization>
+          <position></position>
+          <voice></voice>
+          <fax></fax>
+          <email></email>
+          <role></role>
+        </contact>
         <links/>
         <fees></fees>
         <encoding></encoding>
@@ -22183,7 +22194,15 @@ def my_form_open(dialog, layer, feature):
             <geographicflag>false</geographicflag>
           </spatialrefsys>
         </crs>
-        <extent/>
+        <extent>
+          <spatial maxz="0" minx="0" maxx="0" minz="0" crs="" miny="0" maxy="0" dimensions="2"/>
+          <temporal>
+            <period>
+              <start></start>
+              <end></end>
+            </period>
+          </temporal>
+        </extent>
       </resourceMetadata>
       <provider encoding="">memory</provider>
       <vectorjoins/>
@@ -22201,58 +22220,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" startExpression="" mode="0" limitMode="0" endField="" fixedDuration="0" accumulate="0" durationUnit="min" startField="" endExpression="" enabled="0">
+      <temporal durationField="" fixedDuration="0" accumulate="0" endField="" startField="" enabled="0" startExpression="" endExpression="" durationUnit="min" mode="0" limitMode="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" zscale="1" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" binding="Centroid" type="IndividualFeatures" symbology="Line" extrusion="0" zoffset="0">
+      <elevation extrusionEnabled="0" symbology="Line" type="IndividualFeatures" zscale="1" clamping="Terrain" showMarkerSymbolInSurfacePlots="0" zoffset="0" extrusion="0" respectLayerSymbol="1" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="225,89,137,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="225,89,137,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -22283,36 +22302,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="225,89,137,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="161,64,98,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="225,89,137,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="161,64,98,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="225,89,137,255"/>
@@ -22327,44 +22346,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="225,89,137,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="161,64,98,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="225,89,137,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="diamond" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="161,64,98,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="3" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -22387,54 +22406,54 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" type="nullSymbol" symbollevels="0" referencescale="-1" enableorderby="0"/>
+      <renderer-v2 enableorderby="0" type="nullSymbol" symbollevels="0" referencescale="-1" forceraster="0"/>
       <labeling type="rule-based">
-        <rules key="{cde085cc-58f2-4c49-a2cc-2614d5832170}">
-          <rule filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal$)' )" description="Active routes" key="{95db1799-9de4-4074-994e-29c2f4e9f52f}">
+        <rules key="{4da76d50-b431-43d2-8f08-7664d5762a1c}">
+          <rule description="Active routes" key="{f3d8c637-3bb6-4249-ba55-f0c57bee5e55}" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal$)' )">
             <settings calloutType="simple">
-              <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="63" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="255,255,255,255" textOpacity="1" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" useSubstitutions="0" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="10" namedStyle="Semibold" forcedItalic="0" isExpression="1" fontSizeUnit="Point" allowHtml="0" legendString="Aa">
+              <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="Semibold" fontUnderline="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" useSubstitutions="0" fontWeight="63" fontStrikeout="0" fontItalic="0" fontSize="10" allowHtml="0" fontKerning="1" textColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" isExpression="1" legendString="Aa" textOrientation="horizontal">
                 <families/>
-                <text-buffer bufferNoFill="0" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="0"/>
-                <background shapeRadiiY="1" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="0,0,0,255" shapeDraw="1" shapeBorderWidth="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="1" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="0,0,0,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="1" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-                  <symbol is_animated="0" type="marker" name="markerSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+                <text-buffer bufferNoFill="0" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+                <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskType="0"/>
+                <background shapeRadiiY="1" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="0,0,0,255" shapeRotationType="0" shapeSizeX="1" shapeDraw="1" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="0,0,0,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="1">
+                  <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="markerSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                    <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
                       <Option type="Map">
-                        <Option value="0" type="QString" name="angle"/>
-                        <Option value="square" type="QString" name="cap_style"/>
-                        <Option value="213,180,60,255" type="QString" name="color"/>
-                        <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="circle" type="QString" name="name"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="diameter" type="QString" name="scale_method"/>
-                        <Option value="2" type="QString" name="size"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="size_unit"/>
-                        <Option value="1" type="QString" name="vertical_anchor_point"/>
+                        <Option type="QString" value="0" name="angle"/>
+                        <Option type="QString" value="square" name="cap_style"/>
+                        <Option type="QString" value="213,180,60,255" name="color"/>
+                        <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="circle" name="name"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="diameter" name="scale_method"/>
+                        <Option type="QString" value="2" name="size"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="size_unit"/>
+                        <Option type="QString" value="1" name="vertical_anchor_point"/>
                       </Option>
                       <prop k="angle" v="0"/>
                       <prop k="cap_style" v="square"/>
@@ -22457,34 +22476,34 @@ def my_form_open(dialog, layer, feature):
                       <prop k="vertical_anchor_point" v="1"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+                  <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="0,0,0,255" type="QString" name="color"/>
-                        <Option value="round" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="1" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="0,0,0,255" name="color"/>
+                        <Option type="QString" value="round" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="1" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="0,0,0,255"/>
@@ -22499,138 +22518,138 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option value="true" type="bool" name="active"/>
-                              <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                              <Option value="3" type="int" name="type"/>
+                              <Option type="bool" value="true" name="active"/>
+                              <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
+                              <Option type="int" value="3" name="type"/>
                             </Option>
                             <Option type="Map" name="outlineColor">
-                              <Option value="true" type="bool" name="active"/>
-                              <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                              <Option value="3" type="int" name="type"/>
+                              <Option type="bool" value="true" name="active"/>
+                              <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
+                              <Option type="int" value="3" name="type"/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format useMaxLineLengthForAutoWrap="1" leftDirectionSymbol="&lt;" wrapChar="" multilineAlign="3" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" decimals="0" rightDirectionSymbol=">" formatNumbers="0"/>
-              <placement overlapHandling="AllowOverlapIfRequired" lineAnchorType="0" centroidInside="0" overrunDistance="0" centroidWhole="0" geometryGeneratorEnabled="0" rotationAngle="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" geometryGeneratorType="PointGeometry" quadOffset="3" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="6" xOffset="0" allowDegraded="1" lineAnchorTextPoint="CenterOfText" layerType="PointGeometry" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" maxCurvedCharAngleOut="-20" repeatDistance="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" dist="2" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" distUnits="MM" lineAnchorClipping="0" placementFlags="10" priority="10" overrunDistanceUnit="MM" maxCurvedCharAngleIn="20" geometryGenerator="" lineAnchorPercent="0.5" yOffset="0" rotationUnit="AngleDegrees"/>
-              <rendering fontMaxPixelSize="10000" drawLabels="1" mergeLines="0" zIndex="0" upsidedownLabels="0" obstacleFactor="2" scaleVisibility="0" limitNumLabels="0" obstacleType="0" fontLimitPixelSize="0" maxNumLabels="2000" minFeatureSize="0" fontMinPixelSize="3" labelPerPart="0" obstacle="1" scaleMax="10000000" scaleMin="1" unplacedVisibility="0"/>
+              <text-format wrapChar="" rightDirectionSymbol=">" plussign="0" leftDirectionSymbol="&lt;" formatNumbers="0" decimals="0" multilineAlign="3" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
+              <placement offsetUnits="MapUnit" xOffset="0" maxCurvedCharAngleOut="-20" layerType="PointGeometry" allowDegraded="1" yOffset="0" overlapHandling="AllowOverlapIfRequired" geometryGeneratorType="PointGeometry" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" repeatDistanceUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" quadOffset="3" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidWhole="0" overrunDistance="0" overrunDistanceUnit="MM" centroidInside="0" placement="6" geometryGenerator="" priority="10" distUnits="MM" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" dist="2" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorTextPoint="CenterOfText" polygonPlacementFlags="2" rotationUnit="AngleDegrees" offsetType="0" placementFlags="10" repeatDistance="0"/>
+              <rendering limitNumLabels="0" obstacleType="0" obstacle="1" scaleMax="10000000" maxNumLabels="2000" labelPerPart="0" scaleMin="1" upsidedownLabels="0" zIndex="0" unplacedVisibility="0" fontLimitPixelSize="0" minFeatureSize="0" fontMaxPixelSize="10000" scaleVisibility="0" fontMinPixelSize="3" drawLabels="1" mergeLines="0" obstacleFactor="2"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="PositionX">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="PositionY">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="PredefinedPositionOrder">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="quadrant" type="QString" name="field"/>
-                      <Option value="2" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="quadrant" name="field"/>
+                      <Option type="int" value="2" name="type"/>
                     </Option>
                     <Option type="Map" name="Rotation">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="rotation" type="QString" name="field"/>
-                      <Option value="2" type="int" name="type"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="QString" value="rotation" name="field"/>
+                      <Option type="int" value="2" name="type"/>
                     </Option>
                     <Option type="Map" name="ShapeBorderColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="ShapeFillColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+                  <Option type="int" value="0" name="blendMode"/>
                   <Option type="Map" name="ddProperties">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
-                  <Option value="false" type="bool" name="drawToAllParts"/>
-                  <Option value="0" type="QString" name="enabled"/>
-                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                  <Option value="&lt;symbol is_animated=&quot;0&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                  <Option value="0" type="double" name="minLength"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                  <Option value="MM" type="QString" name="minLengthUnit"/>
-                  <Option value="0" type="double" name="offsetFromAnchor"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                  <Option value="0" type="double" name="offsetFromLabel"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                  <Option type="bool" value="false" name="drawToAllParts"/>
+                  <Option type="QString" value="0" name="enabled"/>
+                  <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
+                  <Option type="QString" value="&lt;symbol alpha=&quot;1&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
+                  <Option type="double" value="0" name="minLength"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
+                  <Option type="QString" value="MM" name="minLengthUnit"/>
+                  <Option type="double" value="0" name="offsetFromAnchor"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
+                  <Option type="double" value="0" name="offsetFromLabel"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule filter="regexp_match( attribute( @atlas_feature , 'type' ), '^marshal (plan|overview)' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" description="Show by day" key="{379f64c2-b5f6-4f7d-a33c-c6a10b65e7ef}">
+          <rule description="Show by day" key="{839f054f-e86d-4118-a253-e1d5c81234fa}" filter="regexp_match( attribute( @atlas_feature , 'type' ), '^marshal (plan|overview)' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )">
             <settings calloutType="simple">
-              <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="63" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="255,255,255,255" textOpacity="1" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" useSubstitutions="0" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="10" namedStyle="Semibold" forcedItalic="0" isExpression="1" fontSizeUnit="Point" allowHtml="0" legendString="Aa">
+              <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="Semibold" fontUnderline="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" useSubstitutions="0" fontWeight="63" fontStrikeout="0" fontItalic="0" fontSize="10" allowHtml="0" fontKerning="1" textColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" isExpression="1" legendString="Aa" textOrientation="horizontal">
                 <families/>
-                <text-buffer bufferNoFill="0" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="0"/>
-                <background shapeRadiiY="1" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="0,0,0,255" shapeDraw="1" shapeBorderWidth="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="1" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="0,0,0,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="1" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-                  <symbol is_animated="0" type="marker" name="markerSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+                <text-buffer bufferNoFill="0" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+                <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskType="0"/>
+                <background shapeRadiiY="1" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="0,0,0,255" shapeRotationType="0" shapeSizeX="1" shapeDraw="1" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="0,0,0,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="1">
+                  <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="markerSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                    <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
                       <Option type="Map">
-                        <Option value="0" type="QString" name="angle"/>
-                        <Option value="square" type="QString" name="cap_style"/>
-                        <Option value="213,180,60,255" type="QString" name="color"/>
-                        <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                        <Option value="bevel" type="QString" name="joinstyle"/>
-                        <Option value="circle" type="QString" name="name"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="diameter" type="QString" name="scale_method"/>
-                        <Option value="2" type="QString" name="size"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="size_unit"/>
-                        <Option value="1" type="QString" name="vertical_anchor_point"/>
+                        <Option type="QString" value="0" name="angle"/>
+                        <Option type="QString" value="square" name="cap_style"/>
+                        <Option type="QString" value="213,180,60,255" name="color"/>
+                        <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="circle" name="name"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="diameter" name="scale_method"/>
+                        <Option type="QString" value="2" name="size"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="size_unit"/>
+                        <Option type="QString" value="1" name="vertical_anchor_point"/>
                       </Option>
                       <prop k="angle" v="0"/>
                       <prop k="cap_style" v="square"/>
@@ -22653,34 +22672,34 @@ def my_form_open(dialog, layer, feature):
                       <prop k="vertical_anchor_point" v="1"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+                  <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="0,0,0,255" type="QString" name="color"/>
-                        <Option value="round" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="1" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="0,0,0,255" name="color"/>
+                        <Option type="QString" value="round" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="1" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="0,0,0,255"/>
@@ -22695,131 +22714,131 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option type="Map" name="properties">
                             <Option type="Map" name="fillColor">
-                              <Option value="true" type="bool" name="active"/>
-                              <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                              <Option value="3" type="int" name="type"/>
+                              <Option type="bool" value="true" name="active"/>
+                              <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
+                              <Option type="int" value="3" name="type"/>
                             </Option>
                             <Option type="Map" name="outlineColor">
-                              <Option value="true" type="bool" name="active"/>
-                              <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                              <Option value="3" type="int" name="type"/>
+                              <Option type="bool" value="true" name="active"/>
+                              <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
+                              <Option type="int" value="3" name="type"/>
                             </Option>
                           </Option>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format useMaxLineLengthForAutoWrap="1" leftDirectionSymbol="&lt;" wrapChar="" multilineAlign="3" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" decimals="0" rightDirectionSymbol=">" formatNumbers="0"/>
-              <placement overlapHandling="AllowOverlapIfRequired" lineAnchorType="0" centroidInside="0" overrunDistance="0" centroidWhole="0" geometryGeneratorEnabled="0" rotationAngle="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" geometryGeneratorType="PointGeometry" quadOffset="3" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="6" xOffset="0" allowDegraded="1" lineAnchorTextPoint="CenterOfText" layerType="PointGeometry" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" maxCurvedCharAngleOut="-20" repeatDistance="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" dist="2" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" distUnits="MM" lineAnchorClipping="0" placementFlags="10" priority="10" overrunDistanceUnit="MM" maxCurvedCharAngleIn="20" geometryGenerator="" lineAnchorPercent="0.5" yOffset="0" rotationUnit="AngleDegrees"/>
-              <rendering fontMaxPixelSize="10000" drawLabels="1" mergeLines="0" zIndex="0" upsidedownLabels="0" obstacleFactor="2" scaleVisibility="0" limitNumLabels="0" obstacleType="0" fontLimitPixelSize="0" maxNumLabels="2000" minFeatureSize="0" fontMinPixelSize="3" labelPerPart="0" obstacle="1" scaleMax="10000000" scaleMin="1" unplacedVisibility="0"/>
+              <text-format wrapChar="" rightDirectionSymbol=">" plussign="0" leftDirectionSymbol="&lt;" formatNumbers="0" decimals="0" multilineAlign="3" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
+              <placement offsetUnits="MapUnit" xOffset="0" maxCurvedCharAngleOut="-20" layerType="PointGeometry" allowDegraded="1" yOffset="0" overlapHandling="AllowOverlapIfRequired" geometryGeneratorType="PointGeometry" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" repeatDistanceUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" quadOffset="3" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidWhole="0" overrunDistance="0" overrunDistanceUnit="MM" centroidInside="0" placement="6" geometryGenerator="" priority="10" distUnits="MM" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" dist="2" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorTextPoint="CenterOfText" polygonPlacementFlags="2" rotationUnit="AngleDegrees" offsetType="0" placementFlags="10" repeatDistance="0"/>
+              <rendering limitNumLabels="0" obstacleType="0" obstacle="1" scaleMax="10000000" maxNumLabels="2000" labelPerPart="0" scaleMin="1" upsidedownLabels="0" zIndex="0" unplacedVisibility="0" fontLimitPixelSize="0" minFeatureSize="0" fontMaxPixelSize="10000" scaleVisibility="0" fontMinPixelSize="3" drawLabels="1" mergeLines="0" obstacleFactor="2"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="PositionX">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="PositionY">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                     <Option type="Map" name="PredefinedPositionOrder">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="quadrant" type="QString" name="field"/>
-                      <Option value="2" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="quadrant" name="field"/>
+                      <Option type="int" value="2" name="type"/>
                     </Option>
                     <Option type="Map" name="Rotation">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="rotation" type="QString" name="field"/>
-                      <Option value="2" type="int" name="type"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="QString" value="rotation" name="field"/>
+                      <Option type="int" value="2" name="type"/>
                     </Option>
                     <Option type="Map" name="ShapeBorderColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="ShapeFillColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+                  <Option type="int" value="0" name="blendMode"/>
                   <Option type="Map" name="ddProperties">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
-                  <Option value="false" type="bool" name="drawToAllParts"/>
-                  <Option value="0" type="QString" name="enabled"/>
-                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                  <Option value="&lt;symbol is_animated=&quot;0&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                  <Option value="0" type="double" name="minLength"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                  <Option value="MM" type="QString" name="minLengthUnit"/>
-                  <Option value="0" type="double" name="offsetFromAnchor"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                  <Option value="0" type="double" name="offsetFromLabel"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                  <Option type="bool" value="false" name="drawToAllParts"/>
+                  <Option type="QString" value="0" name="enabled"/>
+                  <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
+                  <Option type="QString" value="&lt;symbol alpha=&quot;1&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
+                  <Option type="double" value="0" name="minLength"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
+                  <Option type="QString" value="MM" name="minLengthUnit"/>
+                  <Option type="double" value="0" name="offsetFromAnchor"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
+                  <Option type="double" value="0" name="offsetFromLabel"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule active="0" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" description="List for legends" key="{72924649-3eef-4d1a-8529-de69270205d9}">
-            <rule active="0" filter="&quot;Source&quot; = '21KM'" description="21KM" key="{e7facde6-7dab-47b6-82a7-d1c25c9249a4}">
+          <rule description="List for legends" active="0" key="{905e8a77-980c-42e8-94ac-662ad263ccb8}" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )">
+            <rule description="21KM" active="0" key="{9ed61d0c-920f-41ee-848c-d0202cb5c55a}" filter="&quot;Source&quot; = '21KM'">
               <settings calloutType="simple">
-                <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="63" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="255,255,255,255" textOpacity="1" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" useSubstitutions="0" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="10" namedStyle="Semibold" forcedItalic="0" isExpression="1" fontSizeUnit="Point" allowHtml="0" legendString="Aa">
+                <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="Semibold" fontUnderline="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" useSubstitutions="0" fontWeight="63" fontStrikeout="0" fontItalic="0" fontSize="10" allowHtml="0" fontKerning="1" textColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" isExpression="1" legendString="Aa" textOrientation="horizontal">
                   <families/>
-                  <text-buffer bufferNoFill="0" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                  <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="0"/>
-                  <background shapeRadiiY="1" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="210,32,39,255" shapeDraw="1" shapeBorderWidth="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="1" shapeType="0" shapeJoinStyle="128" shapeOffsetUnit="MM" shapeBorderColor="210,32,39,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="1" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-                    <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+                  <text-buffer bufferNoFill="0" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+                  <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskType="0"/>
+                  <background shapeRadiiY="1" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="210,32,39,255" shapeRotationType="0" shapeSizeX="1" shapeDraw="1" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="128" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="210,32,39,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="1">
+                    <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
-                      <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                      <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                         <Option type="Map">
-                          <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                          <Option value="210,32,39,255" type="QString" name="color"/>
-                          <Option value="round" type="QString" name="joinstyle"/>
-                          <Option value="0,0" type="QString" name="offset"/>
-                          <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                          <Option value="MM" type="QString" name="offset_unit"/>
-                          <Option value="210,32,39,255" type="QString" name="outline_color"/>
-                          <Option value="solid" type="QString" name="outline_style"/>
-                          <Option value="1" type="QString" name="outline_width"/>
-                          <Option value="MM" type="QString" name="outline_width_unit"/>
-                          <Option value="solid" type="QString" name="style"/>
+                          <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                          <Option type="QString" value="210,32,39,255" name="color"/>
+                          <Option type="QString" value="round" name="joinstyle"/>
+                          <Option type="QString" value="0,0" name="offset"/>
+                          <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                          <Option type="QString" value="MM" name="offset_unit"/>
+                          <Option type="QString" value="210,32,39,255" name="outline_color"/>
+                          <Option type="QString" value="solid" name="outline_style"/>
+                          <Option type="QString" value="1" name="outline_width"/>
+                          <Option type="QString" value="MM" name="outline_width_unit"/>
+                          <Option type="QString" value="solid" name="style"/>
                         </Option>
                         <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                         <prop k="color" v="210,32,39,255"/>
@@ -22834,130 +22853,130 @@ def my_form_open(dialog, layer, feature):
                         <prop k="style" v="solid"/>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option value="" type="QString" name="name"/>
+                            <Option type="QString" value="" name="name"/>
                             <Option name="properties"/>
-                            <Option value="collection" type="QString" name="type"/>
+                            <Option type="QString" value="collection" name="type"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+                  <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
                   <dd_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="PositionX">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="int" value="1" name="type"/>
+                          <Option type="QString" value="" name="val"/>
                         </Option>
                         <Option type="Map" name="PositionY">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="int" value="1" name="type"/>
+                          <Option type="QString" value="" name="val"/>
                         </Option>
                         <Option type="Map" name="PredefinedPositionOrder">
-                          <Option value="true" type="bool" name="active"/>
-                          <Option value="quadrant" type="QString" name="field"/>
-                          <Option value="2" type="int" name="type"/>
+                          <Option type="bool" value="true" name="active"/>
+                          <Option type="QString" value="quadrant" name="field"/>
+                          <Option type="int" value="2" name="type"/>
                         </Option>
                         <Option type="Map" name="Rotation">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="rotation" type="QString" name="field"/>
-                          <Option value="2" type="int" name="type"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="QString" value="rotation" name="field"/>
+                          <Option type="int" value="2" name="type"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format useMaxLineLengthForAutoWrap="1" leftDirectionSymbol="&lt;" wrapChar="" multilineAlign="3" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" decimals="0" rightDirectionSymbol=">" formatNumbers="0"/>
-                <placement overlapHandling="AllowOverlapIfRequired" lineAnchorType="0" centroidInside="0" overrunDistance="0" centroidWhole="0" geometryGeneratorEnabled="0" rotationAngle="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" geometryGeneratorType="PointGeometry" quadOffset="3" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="6" xOffset="0" allowDegraded="1" lineAnchorTextPoint="CenterOfText" layerType="UnknownGeometry" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" maxCurvedCharAngleOut="-20" repeatDistance="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" dist="2" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" distUnits="MM" lineAnchorClipping="0" placementFlags="10" priority="10" overrunDistanceUnit="MM" maxCurvedCharAngleIn="20" geometryGenerator="" lineAnchorPercent="0.5" yOffset="0" rotationUnit="AngleDegrees"/>
-                <rendering fontMaxPixelSize="10000" drawLabels="1" mergeLines="0" zIndex="0" upsidedownLabels="0" obstacleFactor="2" scaleVisibility="0" limitNumLabels="0" obstacleType="0" fontLimitPixelSize="0" maxNumLabels="2000" minFeatureSize="0" fontMinPixelSize="3" labelPerPart="0" obstacle="1" scaleMax="10000000" scaleMin="1" unplacedVisibility="0"/>
+                <text-format wrapChar="" rightDirectionSymbol=">" plussign="0" leftDirectionSymbol="&lt;" formatNumbers="0" decimals="0" multilineAlign="3" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
+                <placement offsetUnits="MapUnit" xOffset="0" maxCurvedCharAngleOut="-20" layerType="UnknownGeometry" allowDegraded="1" yOffset="0" overlapHandling="AllowOverlapIfRequired" geometryGeneratorType="PointGeometry" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" repeatDistanceUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" quadOffset="3" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidWhole="0" overrunDistance="0" overrunDistanceUnit="MM" centroidInside="0" placement="6" geometryGenerator="" priority="10" distUnits="MM" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" dist="2" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorTextPoint="CenterOfText" polygonPlacementFlags="2" rotationUnit="AngleDegrees" offsetType="0" placementFlags="10" repeatDistance="0"/>
+                <rendering limitNumLabels="0" obstacleType="0" obstacle="1" scaleMax="10000000" maxNumLabels="2000" labelPerPart="0" scaleMin="1" upsidedownLabels="0" zIndex="0" unplacedVisibility="0" fontLimitPixelSize="0" minFeatureSize="0" fontMaxPixelSize="10000" scaleVisibility="0" fontMinPixelSize="3" drawLabels="1" mergeLines="0" obstacleFactor="2"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option type="Map" name="properties">
                       <Option type="Map" name="PositionX">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
+                        <Option type="bool" value="false" name="active"/>
+                        <Option type="int" value="1" name="type"/>
+                        <Option type="QString" value="" name="val"/>
                       </Option>
                       <Option type="Map" name="PositionY">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
+                        <Option type="bool" value="false" name="active"/>
+                        <Option type="int" value="1" name="type"/>
+                        <Option type="QString" value="" name="val"/>
                       </Option>
                       <Option type="Map" name="PredefinedPositionOrder">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="quadrant" type="QString" name="field"/>
-                        <Option value="2" type="int" name="type"/>
+                        <Option type="bool" value="true" name="active"/>
+                        <Option type="QString" value="quadrant" name="field"/>
+                        <Option type="int" value="2" name="type"/>
                       </Option>
                       <Option type="Map" name="Rotation">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="rotation" type="QString" name="field"/>
-                        <Option value="2" type="int" name="type"/>
+                        <Option type="bool" value="false" name="active"/>
+                        <Option type="QString" value="rotation" name="field"/>
+                        <Option type="int" value="2" name="type"/>
                       </Option>
                     </Option>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </dd_properties>
                 <callout type="simple">
                   <Option type="Map">
-                    <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                    <Option value="0" type="int" name="blendMode"/>
+                    <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+                    <Option type="int" value="0" name="blendMode"/>
                     <Option type="Map" name="ddProperties">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
-                    <Option value="false" type="bool" name="drawToAllParts"/>
-                    <Option value="0" type="QString" name="enabled"/>
-                    <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                    <Option value="&lt;symbol is_animated=&quot;0&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                    <Option value="0" type="double" name="minLength"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                    <Option value="MM" type="QString" name="minLengthUnit"/>
-                    <Option value="0" type="double" name="offsetFromAnchor"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                    <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                    <Option value="0" type="double" name="offsetFromLabel"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                    <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                    <Option type="bool" value="false" name="drawToAllParts"/>
+                    <Option type="QString" value="0" name="enabled"/>
+                    <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
+                    <Option type="QString" value="&lt;symbol alpha=&quot;1&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
+                    <Option type="double" value="0" name="minLength"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
+                    <Option type="QString" value="MM" name="minLengthUnit"/>
+                    <Option type="double" value="0" name="offsetFromAnchor"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
+                    <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
+                    <Option type="double" value="0" name="offsetFromLabel"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
+                    <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
                   </Option>
                 </callout>
               </settings>
             </rule>
-            <rule active="0" filter="&quot;Source&quot; = '10KM'" description="10KM" key="{7539ef8a-1068-4b69-a2cc-c8e9b0369bb7}">
+            <rule description="10KM" active="0" key="{b1e8ae3d-36ba-4724-a299-5faba67854ef}" filter="&quot;Source&quot; = '10KM'">
               <settings calloutType="simple">
-                <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="63" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="255,255,255,255" textOpacity="1" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" useSubstitutions="0" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="10" namedStyle="Semibold" forcedItalic="0" isExpression="1" fontSizeUnit="Point" allowHtml="0" legendString="Aa">
+                <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="Semibold" fontUnderline="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" useSubstitutions="0" fontWeight="63" fontStrikeout="0" fontItalic="0" fontSize="10" allowHtml="0" fontKerning="1" textColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" isExpression="1" legendString="Aa" textOrientation="horizontal">
                   <families/>
-                  <text-buffer bufferNoFill="0" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                  <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="0"/>
-                  <background shapeRadiiY="1" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="103,34,144,255" shapeDraw="1" shapeBorderWidth="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="1" shapeType="0" shapeJoinStyle="128" shapeOffsetUnit="MM" shapeBorderColor="103,34,144,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="1" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-                    <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+                  <text-buffer bufferNoFill="0" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+                  <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskType="0"/>
+                  <background shapeRadiiY="1" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="103,34,144,255" shapeRotationType="0" shapeSizeX="1" shapeDraw="1" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="128" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="103,34,144,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="1">
+                    <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
-                      <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                      <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                         <Option type="Map">
-                          <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                          <Option value="103,34,144,255" type="QString" name="color"/>
-                          <Option value="round" type="QString" name="joinstyle"/>
-                          <Option value="0,0" type="QString" name="offset"/>
-                          <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                          <Option value="MM" type="QString" name="offset_unit"/>
-                          <Option value="103,34,144,255" type="QString" name="outline_color"/>
-                          <Option value="solid" type="QString" name="outline_style"/>
-                          <Option value="1" type="QString" name="outline_width"/>
-                          <Option value="MM" type="QString" name="outline_width_unit"/>
-                          <Option value="solid" type="QString" name="style"/>
+                          <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                          <Option type="QString" value="103,34,144,255" name="color"/>
+                          <Option type="QString" value="round" name="joinstyle"/>
+                          <Option type="QString" value="0,0" name="offset"/>
+                          <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                          <Option type="QString" value="MM" name="offset_unit"/>
+                          <Option type="QString" value="103,34,144,255" name="outline_color"/>
+                          <Option type="QString" value="solid" name="outline_style"/>
+                          <Option type="QString" value="1" name="outline_width"/>
+                          <Option type="QString" value="MM" name="outline_width_unit"/>
+                          <Option type="QString" value="solid" name="style"/>
                         </Option>
                         <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                         <prop k="color" v="103,34,144,255"/>
@@ -22972,130 +22991,130 @@ def my_form_open(dialog, layer, feature):
                         <prop k="style" v="solid"/>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option value="" type="QString" name="name"/>
+                            <Option type="QString" value="" name="name"/>
                             <Option name="properties"/>
-                            <Option value="collection" type="QString" name="type"/>
+                            <Option type="QString" value="collection" name="type"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+                  <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
                   <dd_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="PositionX">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="int" value="1" name="type"/>
+                          <Option type="QString" value="" name="val"/>
                         </Option>
                         <Option type="Map" name="PositionY">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="int" value="1" name="type"/>
+                          <Option type="QString" value="" name="val"/>
                         </Option>
                         <Option type="Map" name="PredefinedPositionOrder">
-                          <Option value="true" type="bool" name="active"/>
-                          <Option value="quadrant" type="QString" name="field"/>
-                          <Option value="2" type="int" name="type"/>
+                          <Option type="bool" value="true" name="active"/>
+                          <Option type="QString" value="quadrant" name="field"/>
+                          <Option type="int" value="2" name="type"/>
                         </Option>
                         <Option type="Map" name="Rotation">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="rotation" type="QString" name="field"/>
-                          <Option value="2" type="int" name="type"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="QString" value="rotation" name="field"/>
+                          <Option type="int" value="2" name="type"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format useMaxLineLengthForAutoWrap="1" leftDirectionSymbol="&lt;" wrapChar="" multilineAlign="3" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" decimals="0" rightDirectionSymbol=">" formatNumbers="0"/>
-                <placement overlapHandling="AllowOverlapIfRequired" lineAnchorType="0" centroidInside="0" overrunDistance="0" centroidWhole="0" geometryGeneratorEnabled="0" rotationAngle="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" geometryGeneratorType="PointGeometry" quadOffset="4" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="6" xOffset="0" allowDegraded="1" lineAnchorTextPoint="CenterOfText" layerType="UnknownGeometry" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" maxCurvedCharAngleOut="-20" repeatDistance="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" dist="2" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" distUnits="MM" lineAnchorClipping="0" placementFlags="10" priority="10" overrunDistanceUnit="MM" maxCurvedCharAngleIn="20" geometryGenerator="" lineAnchorPercent="0.5" yOffset="0" rotationUnit="AngleDegrees"/>
-                <rendering fontMaxPixelSize="10000" drawLabels="1" mergeLines="0" zIndex="0" upsidedownLabels="0" obstacleFactor="2" scaleVisibility="0" limitNumLabels="0" obstacleType="0" fontLimitPixelSize="0" maxNumLabels="2000" minFeatureSize="0" fontMinPixelSize="3" labelPerPart="0" obstacle="1" scaleMax="10000000" scaleMin="1" unplacedVisibility="0"/>
+                <text-format wrapChar="" rightDirectionSymbol=">" plussign="0" leftDirectionSymbol="&lt;" formatNumbers="0" decimals="0" multilineAlign="3" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
+                <placement offsetUnits="MapUnit" xOffset="0" maxCurvedCharAngleOut="-20" layerType="UnknownGeometry" allowDegraded="1" yOffset="0" overlapHandling="AllowOverlapIfRequired" geometryGeneratorType="PointGeometry" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" repeatDistanceUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" quadOffset="4" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidWhole="0" overrunDistance="0" overrunDistanceUnit="MM" centroidInside="0" placement="6" geometryGenerator="" priority="10" distUnits="MM" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" dist="2" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorTextPoint="CenterOfText" polygonPlacementFlags="2" rotationUnit="AngleDegrees" offsetType="0" placementFlags="10" repeatDistance="0"/>
+                <rendering limitNumLabels="0" obstacleType="0" obstacle="1" scaleMax="10000000" maxNumLabels="2000" labelPerPart="0" scaleMin="1" upsidedownLabels="0" zIndex="0" unplacedVisibility="0" fontLimitPixelSize="0" minFeatureSize="0" fontMaxPixelSize="10000" scaleVisibility="0" fontMinPixelSize="3" drawLabels="1" mergeLines="0" obstacleFactor="2"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option type="Map" name="properties">
                       <Option type="Map" name="PositionX">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
+                        <Option type="bool" value="false" name="active"/>
+                        <Option type="int" value="1" name="type"/>
+                        <Option type="QString" value="" name="val"/>
                       </Option>
                       <Option type="Map" name="PositionY">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
+                        <Option type="bool" value="false" name="active"/>
+                        <Option type="int" value="1" name="type"/>
+                        <Option type="QString" value="" name="val"/>
                       </Option>
                       <Option type="Map" name="PredefinedPositionOrder">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="quadrant" type="QString" name="field"/>
-                        <Option value="2" type="int" name="type"/>
+                        <Option type="bool" value="true" name="active"/>
+                        <Option type="QString" value="quadrant" name="field"/>
+                        <Option type="int" value="2" name="type"/>
                       </Option>
                       <Option type="Map" name="Rotation">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="rotation" type="QString" name="field"/>
-                        <Option value="2" type="int" name="type"/>
+                        <Option type="bool" value="false" name="active"/>
+                        <Option type="QString" value="rotation" name="field"/>
+                        <Option type="int" value="2" name="type"/>
                       </Option>
                     </Option>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </dd_properties>
                 <callout type="simple">
                   <Option type="Map">
-                    <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                    <Option value="0" type="int" name="blendMode"/>
+                    <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+                    <Option type="int" value="0" name="blendMode"/>
                     <Option type="Map" name="ddProperties">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
-                    <Option value="false" type="bool" name="drawToAllParts"/>
-                    <Option value="0" type="QString" name="enabled"/>
-                    <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                    <Option value="&lt;symbol is_animated=&quot;0&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                    <Option value="0" type="double" name="minLength"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                    <Option value="MM" type="QString" name="minLengthUnit"/>
-                    <Option value="0" type="double" name="offsetFromAnchor"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                    <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                    <Option value="0" type="double" name="offsetFromLabel"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                    <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                    <Option type="bool" value="false" name="drawToAllParts"/>
+                    <Option type="QString" value="0" name="enabled"/>
+                    <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
+                    <Option type="QString" value="&lt;symbol alpha=&quot;1&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
+                    <Option type="double" value="0" name="minLength"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
+                    <Option type="QString" value="MM" name="minLengthUnit"/>
+                    <Option type="double" value="0" name="offsetFromAnchor"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
+                    <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
+                    <Option type="double" value="0" name="offsetFromLabel"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
+                    <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
                   </Option>
                 </callout>
               </settings>
             </rule>
-            <rule active="0" filter="&quot;Source&quot; = '5KM'" description="5KM" key="{8573f5c5-a6be-456b-8bc8-6817ef1a8c90}">
+            <rule description="5KM" active="0" key="{6e7154e1-bcb8-4b17-8bf0-66341d4599dd}" filter="&quot;Source&quot; = '5KM'">
               <settings calloutType="simple">
-                <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="63" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="255,255,255,255" textOpacity="1" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" useSubstitutions="0" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="10" namedStyle="Semibold" forcedItalic="0" isExpression="1" fontSizeUnit="Point" allowHtml="0" legendString="Aa">
+                <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="Semibold" fontUnderline="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" useSubstitutions="0" fontWeight="63" fontStrikeout="0" fontItalic="0" fontSize="10" allowHtml="0" fontKerning="1" textColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" isExpression="1" legendString="Aa" textOrientation="horizontal">
                   <families/>
-                  <text-buffer bufferNoFill="0" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                  <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="0"/>
-                  <background shapeRadiiY="1" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="145,211,55,255" shapeDraw="1" shapeBorderWidth="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="1" shapeType="0" shapeJoinStyle="128" shapeOffsetUnit="MM" shapeBorderColor="145,211,55,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="1" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-                    <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+                  <text-buffer bufferNoFill="0" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+                  <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskType="0"/>
+                  <background shapeRadiiY="1" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="145,211,55,255" shapeRotationType="0" shapeSizeX="1" shapeDraw="1" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="128" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="145,211,55,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="1">
+                    <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
-                      <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                      <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                         <Option type="Map">
-                          <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                          <Option value="145,211,55,255" type="QString" name="color"/>
-                          <Option value="round" type="QString" name="joinstyle"/>
-                          <Option value="0,0" type="QString" name="offset"/>
-                          <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                          <Option value="MM" type="QString" name="offset_unit"/>
-                          <Option value="145,211,55,255" type="QString" name="outline_color"/>
-                          <Option value="solid" type="QString" name="outline_style"/>
-                          <Option value="1" type="QString" name="outline_width"/>
-                          <Option value="MM" type="QString" name="outline_width_unit"/>
-                          <Option value="solid" type="QString" name="style"/>
+                          <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                          <Option type="QString" value="145,211,55,255" name="color"/>
+                          <Option type="QString" value="round" name="joinstyle"/>
+                          <Option type="QString" value="0,0" name="offset"/>
+                          <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                          <Option type="QString" value="MM" name="offset_unit"/>
+                          <Option type="QString" value="145,211,55,255" name="outline_color"/>
+                          <Option type="QString" value="solid" name="outline_style"/>
+                          <Option type="QString" value="1" name="outline_width"/>
+                          <Option type="QString" value="MM" name="outline_width_unit"/>
+                          <Option type="QString" value="solid" name="style"/>
                         </Option>
                         <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                         <prop k="color" v="145,211,55,255"/>
@@ -23110,138 +23129,138 @@ def my_form_open(dialog, layer, feature):
                         <prop k="style" v="solid"/>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option value="" type="QString" name="name"/>
+                            <Option type="QString" value="" name="name"/>
                             <Option name="properties"/>
-                            <Option value="collection" type="QString" name="type"/>
+                            <Option type="QString" value="collection" name="type"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+                  <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
                   <dd_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option type="Map" name="properties">
                         <Option type="Map" name="PositionX">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="int" value="1" name="type"/>
+                          <Option type="QString" value="" name="val"/>
                         </Option>
                         <Option type="Map" name="PositionY">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="1" type="int" name="type"/>
-                          <Option value="" type="QString" name="val"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="int" value="1" name="type"/>
+                          <Option type="QString" value="" name="val"/>
                         </Option>
                         <Option type="Map" name="PredefinedPositionOrder">
-                          <Option value="true" type="bool" name="active"/>
-                          <Option value="quadrant" type="QString" name="field"/>
-                          <Option value="2" type="int" name="type"/>
+                          <Option type="bool" value="true" name="active"/>
+                          <Option type="QString" value="quadrant" name="field"/>
+                          <Option type="int" value="2" name="type"/>
                         </Option>
                         <Option type="Map" name="Rotation">
-                          <Option value="false" type="bool" name="active"/>
-                          <Option value="rotation" type="QString" name="field"/>
-                          <Option value="2" type="int" name="type"/>
+                          <Option type="bool" value="false" name="active"/>
+                          <Option type="QString" value="rotation" name="field"/>
+                          <Option type="int" value="2" name="type"/>
                         </Option>
                       </Option>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format useMaxLineLengthForAutoWrap="1" leftDirectionSymbol="&lt;" wrapChar="" multilineAlign="3" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" decimals="0" rightDirectionSymbol=">" formatNumbers="0"/>
-                <placement overlapHandling="AllowOverlapIfRequired" lineAnchorType="0" centroidInside="0" overrunDistance="0" centroidWhole="0" geometryGeneratorEnabled="0" rotationAngle="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" geometryGeneratorType="PointGeometry" quadOffset="4" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="6" xOffset="0" allowDegraded="1" lineAnchorTextPoint="CenterOfText" layerType="UnknownGeometry" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" maxCurvedCharAngleOut="-20" repeatDistance="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" dist="2" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" distUnits="MM" lineAnchorClipping="0" placementFlags="10" priority="10" overrunDistanceUnit="MM" maxCurvedCharAngleIn="20" geometryGenerator="" lineAnchorPercent="0.5" yOffset="0" rotationUnit="AngleDegrees"/>
-                <rendering fontMaxPixelSize="10000" drawLabels="1" mergeLines="0" zIndex="0" upsidedownLabels="0" obstacleFactor="2" scaleVisibility="0" limitNumLabels="0" obstacleType="0" fontLimitPixelSize="0" maxNumLabels="2000" minFeatureSize="0" fontMinPixelSize="3" labelPerPart="0" obstacle="1" scaleMax="10000000" scaleMin="1" unplacedVisibility="0"/>
+                <text-format wrapChar="" rightDirectionSymbol=">" plussign="0" leftDirectionSymbol="&lt;" formatNumbers="0" decimals="0" multilineAlign="3" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
+                <placement offsetUnits="MapUnit" xOffset="0" maxCurvedCharAngleOut="-20" layerType="UnknownGeometry" allowDegraded="1" yOffset="0" overlapHandling="AllowOverlapIfRequired" geometryGeneratorType="PointGeometry" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" repeatDistanceUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" quadOffset="4" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidWhole="0" overrunDistance="0" overrunDistanceUnit="MM" centroidInside="0" placement="6" geometryGenerator="" priority="10" distUnits="MM" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" dist="2" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorTextPoint="CenterOfText" polygonPlacementFlags="2" rotationUnit="AngleDegrees" offsetType="0" placementFlags="10" repeatDistance="0"/>
+                <rendering limitNumLabels="0" obstacleType="0" obstacle="1" scaleMax="10000000" maxNumLabels="2000" labelPerPart="0" scaleMin="1" upsidedownLabels="0" zIndex="0" unplacedVisibility="0" fontLimitPixelSize="0" minFeatureSize="0" fontMaxPixelSize="10000" scaleVisibility="0" fontMinPixelSize="3" drawLabels="1" mergeLines="0" obstacleFactor="2"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option type="Map" name="properties">
                       <Option type="Map" name="PositionX">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
+                        <Option type="bool" value="false" name="active"/>
+                        <Option type="int" value="1" name="type"/>
+                        <Option type="QString" value="" name="val"/>
                       </Option>
                       <Option type="Map" name="PositionY">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
+                        <Option type="bool" value="false" name="active"/>
+                        <Option type="int" value="1" name="type"/>
+                        <Option type="QString" value="" name="val"/>
                       </Option>
                       <Option type="Map" name="PredefinedPositionOrder">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="quadrant" type="QString" name="field"/>
-                        <Option value="2" type="int" name="type"/>
+                        <Option type="bool" value="true" name="active"/>
+                        <Option type="QString" value="quadrant" name="field"/>
+                        <Option type="int" value="2" name="type"/>
                       </Option>
                       <Option type="Map" name="Rotation">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="rotation" type="QString" name="field"/>
-                        <Option value="2" type="int" name="type"/>
+                        <Option type="bool" value="false" name="active"/>
+                        <Option type="QString" value="rotation" name="field"/>
+                        <Option type="int" value="2" name="type"/>
                       </Option>
                     </Option>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </dd_properties>
                 <callout type="simple">
                   <Option type="Map">
-                    <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                    <Option value="0" type="int" name="blendMode"/>
+                    <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+                    <Option type="int" value="0" name="blendMode"/>
                     <Option type="Map" name="ddProperties">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
-                    <Option value="false" type="bool" name="drawToAllParts"/>
-                    <Option value="0" type="QString" name="enabled"/>
-                    <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                    <Option value="&lt;symbol is_animated=&quot;0&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                    <Option value="0" type="double" name="minLength"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                    <Option value="MM" type="QString" name="minLengthUnit"/>
-                    <Option value="0" type="double" name="offsetFromAnchor"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                    <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                    <Option value="0" type="double" name="offsetFromLabel"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                    <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                    <Option type="bool" value="false" name="drawToAllParts"/>
+                    <Option type="QString" value="0" name="enabled"/>
+                    <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
+                    <Option type="QString" value="&lt;symbol alpha=&quot;1&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
+                    <Option type="double" value="0" name="minLength"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
+                    <Option type="QString" value="MM" name="minLengthUnit"/>
+                    <Option type="double" value="0" name="offsetFromAnchor"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
+                    <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
+                    <Option type="double" value="0" name="offsetFromLabel"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
+                    <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
                   </Option>
                 </callout>
               </settings>
             </rule>
-            <rule active="0" filter="&quot;Source&quot; = 'Trail'" description="Trail" key="{a7469442-5b53-4ac3-b1ce-1af4427c496f}">
+            <rule description="Trail" active="0" key="{d4116bb5-e30d-46f8-be72-731e74a92758}" filter="&quot;Source&quot; = 'Trail'">
               <settings calloutType="simple">
-                <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="63" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="255,255,255,255" textOpacity="1" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" useSubstitutions="0" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="10" namedStyle="Semibold" forcedItalic="0" isExpression="1" fontSizeUnit="Point" allowHtml="0" legendString="Aa">
+                <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="Semibold" fontUnderline="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" useSubstitutions="0" fontWeight="63" fontStrikeout="0" fontItalic="0" fontSize="10" allowHtml="0" fontKerning="1" textColor="255,255,255,255" fontFamily="Myriad Pro" capitalization="0" isExpression="1" legendString="Aa" textOrientation="horizontal">
                   <families/>
-                  <text-buffer bufferNoFill="0" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="64" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                  <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="0"/>
-                  <background shapeRadiiY="1" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="145,211,55,255" shapeDraw="1" shapeBorderWidth="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="1" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="145,211,55,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="1" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-                    <symbol is_animated="0" type="marker" name="markerSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+                  <text-buffer bufferNoFill="0" bufferJoinStyle="64" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+                  <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskType="0"/>
+                  <background shapeRadiiY="1" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="145,211,55,255" shapeRotationType="0" shapeSizeX="1" shapeDraw="1" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="145,211,55,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="1">
+                    <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="markerSymbol">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
-                      <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+                      <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
                         <Option type="Map">
-                          <Option value="0" type="QString" name="angle"/>
-                          <Option value="square" type="QString" name="cap_style"/>
-                          <Option value="133,182,111,255" type="QString" name="color"/>
-                          <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                          <Option value="bevel" type="QString" name="joinstyle"/>
-                          <Option value="circle" type="QString" name="name"/>
-                          <Option value="0,0" type="QString" name="offset"/>
-                          <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                          <Option value="MM" type="QString" name="offset_unit"/>
-                          <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                          <Option value="solid" type="QString" name="outline_style"/>
-                          <Option value="0" type="QString" name="outline_width"/>
-                          <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                          <Option value="MM" type="QString" name="outline_width_unit"/>
-                          <Option value="diameter" type="QString" name="scale_method"/>
-                          <Option value="2" type="QString" name="size"/>
-                          <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                          <Option value="MM" type="QString" name="size_unit"/>
-                          <Option value="1" type="QString" name="vertical_anchor_point"/>
+                          <Option type="QString" value="0" name="angle"/>
+                          <Option type="QString" value="square" name="cap_style"/>
+                          <Option type="QString" value="133,182,111,255" name="color"/>
+                          <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                          <Option type="QString" value="bevel" name="joinstyle"/>
+                          <Option type="QString" value="circle" name="name"/>
+                          <Option type="QString" value="0,0" name="offset"/>
+                          <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                          <Option type="QString" value="MM" name="offset_unit"/>
+                          <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                          <Option type="QString" value="solid" name="outline_style"/>
+                          <Option type="QString" value="0" name="outline_width"/>
+                          <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                          <Option type="QString" value="MM" name="outline_width_unit"/>
+                          <Option type="QString" value="diameter" name="scale_method"/>
+                          <Option type="QString" value="2" name="size"/>
+                          <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                          <Option type="QString" value="MM" name="size_unit"/>
+                          <Option type="QString" value="1" name="vertical_anchor_point"/>
                         </Option>
                         <prop k="angle" v="0"/>
                         <prop k="cap_style" v="square"/>
@@ -23264,34 +23283,34 @@ def my_form_open(dialog, layer, feature):
                         <prop k="vertical_anchor_point" v="1"/>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option value="" type="QString" name="name"/>
+                            <Option type="QString" value="" name="name"/>
                             <Option name="properties"/>
-                            <Option value="collection" type="QString" name="type"/>
+                            <Option type="QString" value="collection" name="type"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
-                    <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+                    <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
-                      <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                      <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                         <Option type="Map">
-                          <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                          <Option value="0,72,255,255" type="QString" name="color"/>
-                          <Option value="round" type="QString" name="joinstyle"/>
-                          <Option value="0,0" type="QString" name="offset"/>
-                          <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                          <Option value="MM" type="QString" name="offset_unit"/>
-                          <Option value="0,72,255,255" type="QString" name="outline_color"/>
-                          <Option value="solid" type="QString" name="outline_style"/>
-                          <Option value="1" type="QString" name="outline_width"/>
-                          <Option value="MM" type="QString" name="outline_width_unit"/>
-                          <Option value="solid" type="QString" name="style"/>
+                          <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                          <Option type="QString" value="0,72,255,255" name="color"/>
+                          <Option type="QString" value="round" name="joinstyle"/>
+                          <Option type="QString" value="0,0" name="offset"/>
+                          <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                          <Option type="QString" value="MM" name="offset_unit"/>
+                          <Option type="QString" value="0,72,255,255" name="outline_color"/>
+                          <Option type="QString" value="solid" name="outline_style"/>
+                          <Option type="QString" value="1" name="outline_width"/>
+                          <Option type="QString" value="MM" name="outline_width_unit"/>
+                          <Option type="QString" value="solid" name="style"/>
                         </Option>
                         <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                         <prop k="color" v="0,72,255,255"/>
@@ -23306,77 +23325,77 @@ def my_form_open(dialog, layer, feature):
                         <prop k="style" v="solid"/>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option value="" type="QString" name="name"/>
+                            <Option type="QString" value="" name="name"/>
                             <Option name="properties"/>
-                            <Option value="collection" type="QString" name="type"/>
+                            <Option type="QString" value="collection" name="type"/>
                           </Option>
                         </data_defined_properties>
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+                  <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
                   <dd_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format useMaxLineLengthForAutoWrap="1" leftDirectionSymbol="&lt;" wrapChar="" multilineAlign="3" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" decimals="0" rightDirectionSymbol=">" formatNumbers="0"/>
-                <placement overlapHandling="AllowOverlapIfRequired" lineAnchorType="0" centroidInside="0" overrunDistance="0" centroidWhole="0" geometryGeneratorEnabled="0" rotationAngle="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" geometryGeneratorType="PointGeometry" quadOffset="4" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="6" xOffset="0" allowDegraded="1" lineAnchorTextPoint="CenterOfText" layerType="PointGeometry" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" maxCurvedCharAngleOut="-20" repeatDistance="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" dist="2" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" distUnits="MM" lineAnchorClipping="0" placementFlags="10" priority="10" overrunDistanceUnit="MM" maxCurvedCharAngleIn="20" geometryGenerator="" lineAnchorPercent="0.5" yOffset="0" rotationUnit="AngleDegrees"/>
-                <rendering fontMaxPixelSize="10000" drawLabels="1" mergeLines="0" zIndex="0" upsidedownLabels="0" obstacleFactor="2" scaleVisibility="0" limitNumLabels="0" obstacleType="0" fontLimitPixelSize="0" maxNumLabels="2000" minFeatureSize="0" fontMinPixelSize="3" labelPerPart="0" obstacle="1" scaleMax="10000000" scaleMin="1" unplacedVisibility="0"/>
+                <text-format wrapChar="" rightDirectionSymbol=">" plussign="0" leftDirectionSymbol="&lt;" formatNumbers="0" decimals="0" multilineAlign="3" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
+                <placement offsetUnits="MapUnit" xOffset="0" maxCurvedCharAngleOut="-20" layerType="PointGeometry" allowDegraded="1" yOffset="0" overlapHandling="AllowOverlapIfRequired" geometryGeneratorType="PointGeometry" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" repeatDistanceUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" quadOffset="4" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidWhole="0" overrunDistance="0" overrunDistanceUnit="MM" centroidInside="0" placement="6" geometryGenerator="" priority="10" distUnits="MM" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" dist="2" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorTextPoint="CenterOfText" polygonPlacementFlags="2" rotationUnit="AngleDegrees" offsetType="0" placementFlags="10" repeatDistance="0"/>
+                <rendering limitNumLabels="0" obstacleType="0" obstacle="1" scaleMax="10000000" maxNumLabels="2000" labelPerPart="0" scaleMin="1" upsidedownLabels="0" zIndex="0" unplacedVisibility="0" fontLimitPixelSize="0" minFeatureSize="0" fontMaxPixelSize="10000" scaleVisibility="0" fontMinPixelSize="3" drawLabels="1" mergeLines="0" obstacleFactor="2"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option type="Map" name="properties">
                       <Option type="Map" name="PositionX">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
+                        <Option type="bool" value="false" name="active"/>
+                        <Option type="int" value="1" name="type"/>
+                        <Option type="QString" value="" name="val"/>
                       </Option>
                       <Option type="Map" name="PositionY">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="1" type="int" name="type"/>
-                        <Option value="" type="QString" name="val"/>
+                        <Option type="bool" value="false" name="active"/>
+                        <Option type="int" value="1" name="type"/>
+                        <Option type="QString" value="" name="val"/>
                       </Option>
                       <Option type="Map" name="PredefinedPositionOrder">
-                        <Option value="true" type="bool" name="active"/>
-                        <Option value="quadrant" type="QString" name="field"/>
-                        <Option value="2" type="int" name="type"/>
+                        <Option type="bool" value="true" name="active"/>
+                        <Option type="QString" value="quadrant" name="field"/>
+                        <Option type="int" value="2" name="type"/>
                       </Option>
                       <Option type="Map" name="Rotation">
-                        <Option value="false" type="bool" name="active"/>
-                        <Option value="rotation" type="QString" name="field"/>
-                        <Option value="2" type="int" name="type"/>
+                        <Option type="bool" value="false" name="active"/>
+                        <Option type="QString" value="rotation" name="field"/>
+                        <Option type="int" value="2" name="type"/>
                       </Option>
                     </Option>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </dd_properties>
                 <callout type="simple">
                   <Option type="Map">
-                    <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                    <Option value="0" type="int" name="blendMode"/>
+                    <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+                    <Option type="int" value="0" name="blendMode"/>
                     <Option type="Map" name="ddProperties">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
-                    <Option value="false" type="bool" name="drawToAllParts"/>
-                    <Option value="0" type="QString" name="enabled"/>
-                    <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                    <Option value="&lt;symbol is_animated=&quot;0&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                    <Option value="0" type="double" name="minLength"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                    <Option value="MM" type="QString" name="minLengthUnit"/>
-                    <Option value="0" type="double" name="offsetFromAnchor"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                    <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                    <Option value="0" type="double" name="offsetFromLabel"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                    <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                    <Option type="bool" value="false" name="drawToAllParts"/>
+                    <Option type="QString" value="0" name="enabled"/>
+                    <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
+                    <Option type="QString" value="&lt;symbol alpha=&quot;1&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
+                    <Option type="double" value="0" name="minLength"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
+                    <Option type="QString" value="MM" name="minLengthUnit"/>
+                    <Option type="double" value="0" name="offsetFromAnchor"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
+                    <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
+                    <Option type="double" value="0" name="offsetFromLabel"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
+                    <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
                   </Option>
                 </callout>
               </settings>
@@ -23386,13 +23405,13 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="no_action" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="no_action" name="QFieldSync/action"/>
+          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
           <Option type="List" name="dualview/previewExpressions">
-            <Option value="COALESCE(&quot;Text&quot;, '&lt;NULL>')" type="QString"/>
+            <Option type="QString" value="COALESCE(&quot;Text&quot;, '&lt;NULL>')"/>
           </Option>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="QString" value="0" name="embeddedWidgets/count"/>
           <Option type="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -23400,48 +23419,48 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory penAlpha="255" width="15" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" minimumSize="0" enabled="0" maxScaleDenominator="1e+08" diagramOrientation="Up" opacity="1" scaleBasedVisibility="0" spacingUnit="MM" minScaleDenominator="100000" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" lineSizeType="MM" penWidth="0" backgroundAlpha="255" scaleDependency="Area" spacing="0" direction="1" barWidth="5" sizeType="MM" height="15" penColor="#000000" showAxis="0">
-          <fontProperties bold="0" style="" italic="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0"/>
-          <attribute label="" colorOpacity="1" field="" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory height="15" scaleDependency="Area" width="15" lineSizeScale="3x:0,0,0,0,0,0" spacingUnit="MM" lineSizeType="MM" penColor="#000000" spacing="0" labelPlacementMethod="XHeight" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" backgroundAlpha="255" maxScaleDenominator="1e+08" barWidth="5" penWidth="0" minimumSize="0" penAlpha="255" minScaleDenominator="100000" sizeType="MM" backgroundColor="#ffffff" enabled="0" opacity="1" direction="1" scaleBasedVisibility="0" showAxis="0" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270">
+          <fontProperties style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0" strikethrough="0" italic="0" underline="0" bold="0"/>
+          <attribute color="#000000" field="" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="35,35,35,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0.26" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -23472,9 +23491,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -23482,28 +23501,28 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="2" showAll="1" placement="0" zIndex="0" dist="0" priority="0" obstacle="0">
+      <DiagramLayerSettings priority="0" linePlacementFlags="2" obstacle="0" dist="0" zIndex="0" placement="0" showAll="1">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field configurationFlags="None" name="Name">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -23512,8 +23531,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -23522,8 +23541,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -23532,8 +23551,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -23542,8 +23561,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -23552,8 +23571,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -23562,8 +23581,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -23572,8 +23591,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -23596,8 +23615,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -23606,8 +23625,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -23616,8 +23635,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -23626,8 +23645,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -23641,95 +23660,95 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="Name"/>
-        <alias index="1" name="" field="descriptio"/>
-        <alias index="2" name="" field="timestamp"/>
-        <alias index="3" name="" field="begin"/>
-        <alias index="4" name="" field="end"/>
-        <alias index="5" name="" field="Distance"/>
-        <alias index="6" name="" field="RouteLen"/>
-        <alias index="7" name="" field="Source"/>
-        <alias index="8" name="" field="Sort"/>
-        <alias index="9" name="" field="day"/>
-        <alias index="10" name="" field="length_km"/>
-        <alias index="11" name="" field="length_m"/>
-        <alias index="12" name="" field="org_fid"/>
-        <alias index="13" name="" field="distance"/>
-        <alias index="14" name="" field="quadrant"/>
+        <alias index="0" field="Name" name=""/>
+        <alias index="1" field="descriptio" name=""/>
+        <alias index="2" field="timestamp" name=""/>
+        <alias index="3" field="begin" name=""/>
+        <alias index="4" field="end" name=""/>
+        <alias index="5" field="Distance" name=""/>
+        <alias index="6" field="RouteLen" name=""/>
+        <alias index="7" field="Source" name=""/>
+        <alias index="8" field="Sort" name=""/>
+        <alias index="9" field="day" name=""/>
+        <alias index="10" field="length_km" name=""/>
+        <alias index="11" field="length_m" name=""/>
+        <alias index="12" field="org_fid" name=""/>
+        <alias index="13" field="distance" name=""/>
+        <alias index="14" field="quadrant" name=""/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="Name"/>
-        <default applyOnUpdate="0" expression="" field="descriptio"/>
-        <default applyOnUpdate="0" expression="" field="timestamp"/>
-        <default applyOnUpdate="0" expression="" field="begin"/>
-        <default applyOnUpdate="0" expression="" field="end"/>
-        <default applyOnUpdate="0" expression="" field="Distance"/>
-        <default applyOnUpdate="0" expression="" field="RouteLen"/>
-        <default applyOnUpdate="0" expression="" field="Source"/>
-        <default applyOnUpdate="0" expression="" field="Sort"/>
-        <default applyOnUpdate="0" expression="" field="day"/>
-        <default applyOnUpdate="0" expression="" field="length_km"/>
-        <default applyOnUpdate="0" expression="" field="length_m"/>
-        <default applyOnUpdate="0" expression="" field="org_fid"/>
-        <default applyOnUpdate="0" expression="" field="distance"/>
-        <default applyOnUpdate="0" expression="" field="quadrant"/>
+        <default applyOnUpdate="0" field="Name" expression=""/>
+        <default applyOnUpdate="0" field="descriptio" expression=""/>
+        <default applyOnUpdate="0" field="timestamp" expression=""/>
+        <default applyOnUpdate="0" field="begin" expression=""/>
+        <default applyOnUpdate="0" field="end" expression=""/>
+        <default applyOnUpdate="0" field="Distance" expression=""/>
+        <default applyOnUpdate="0" field="RouteLen" expression=""/>
+        <default applyOnUpdate="0" field="Source" expression=""/>
+        <default applyOnUpdate="0" field="Sort" expression=""/>
+        <default applyOnUpdate="0" field="day" expression=""/>
+        <default applyOnUpdate="0" field="length_km" expression=""/>
+        <default applyOnUpdate="0" field="length_m" expression=""/>
+        <default applyOnUpdate="0" field="org_fid" expression=""/>
+        <default applyOnUpdate="0" field="distance" expression=""/>
+        <default applyOnUpdate="0" field="quadrant" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="Name" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="descriptio" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="timestamp" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="begin" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="end" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="Distance" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="RouteLen" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="Source" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="Sort" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="day" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="length_km" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="length_m" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="org_fid" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="distance" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="quadrant" constraints="0"/>
+        <constraint exp_strength="0" field="Name" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="descriptio" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="timestamp" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="begin" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="end" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="Distance" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="RouteLen" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="Source" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="Sort" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="day" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="length_km" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="length_m" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="org_fid" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="distance" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="quadrant" notnull_strength="0" constraints="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" desc="" field="Name"/>
-        <constraint exp="" desc="" field="descriptio"/>
-        <constraint exp="" desc="" field="timestamp"/>
-        <constraint exp="" desc="" field="begin"/>
-        <constraint exp="" desc="" field="end"/>
-        <constraint exp="" desc="" field="Distance"/>
-        <constraint exp="" desc="" field="RouteLen"/>
-        <constraint exp="" desc="" field="Source"/>
-        <constraint exp="" desc="" field="Sort"/>
-        <constraint exp="" desc="" field="day"/>
-        <constraint exp="" desc="" field="length_km"/>
-        <constraint exp="" desc="" field="length_m"/>
-        <constraint exp="" desc="" field="org_fid"/>
-        <constraint exp="" desc="" field="distance"/>
-        <constraint exp="" desc="" field="quadrant"/>
+        <constraint exp="" field="Name" desc=""/>
+        <constraint exp="" field="descriptio" desc=""/>
+        <constraint exp="" field="timestamp" desc=""/>
+        <constraint exp="" field="begin" desc=""/>
+        <constraint exp="" field="end" desc=""/>
+        <constraint exp="" field="Distance" desc=""/>
+        <constraint exp="" field="RouteLen" desc=""/>
+        <constraint exp="" field="Source" desc=""/>
+        <constraint exp="" field="Sort" desc=""/>
+        <constraint exp="" field="day" desc=""/>
+        <constraint exp="" field="length_km" desc=""/>
+        <constraint exp="" field="length_m" desc=""/>
+        <constraint exp="" field="org_fid" desc=""/>
+        <constraint exp="" field="distance" desc=""/>
+        <constraint exp="" field="quadrant" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="&quot;Distance&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="&quot;Distance&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
           <column width="-1" type="actions" hidden="1"/>
-          <column width="-1" type="field" name="org_fid" hidden="0"/>
-          <column width="-1" type="field" name="distance" hidden="0"/>
-          <column width="-1" type="field" name="Name" hidden="0"/>
-          <column width="-1" type="field" name="Source" hidden="0"/>
-          <column width="-1" type="field" name="RouteLen" hidden="0"/>
-          <column width="-1" type="field" name="descriptio" hidden="0"/>
-          <column width="-1" type="field" name="timestamp" hidden="0"/>
-          <column width="-1" type="field" name="begin" hidden="0"/>
-          <column width="-1" type="field" name="end" hidden="0"/>
-          <column width="-1" type="field" name="Distance" hidden="0"/>
-          <column width="-1" type="field" name="length_km" hidden="0"/>
-          <column width="-1" type="field" name="Sort" hidden="0"/>
-          <column width="-1" type="field" name="quadrant" hidden="0"/>
-          <column width="-1" type="field" name="day" hidden="0"/>
-          <column width="-1" type="field" name="length_m" hidden="0"/>
+          <column width="-1" type="field" hidden="0" name="org_fid"/>
+          <column width="-1" type="field" hidden="0" name="distance"/>
+          <column width="-1" type="field" hidden="0" name="Name"/>
+          <column width="-1" type="field" hidden="0" name="Source"/>
+          <column width="-1" type="field" hidden="0" name="RouteLen"/>
+          <column width="-1" type="field" hidden="0" name="descriptio"/>
+          <column width="-1" type="field" hidden="0" name="timestamp"/>
+          <column width="-1" type="field" hidden="0" name="begin"/>
+          <column width="-1" type="field" hidden="0" name="end"/>
+          <column width="-1" type="field" hidden="0" name="Distance"/>
+          <column width="-1" type="field" hidden="0" name="length_km"/>
+          <column width="-1" type="field" hidden="0" name="Sort"/>
+          <column width="-1" type="field" hidden="0" name="quadrant"/>
+          <column width="-1" type="field" hidden="0" name="day"/>
+          <column width="-1" type="field" hidden="0" name="length_m"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -23761,62 +23780,62 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="Distance" editable="1"/>
-        <field name="Name" editable="1"/>
-        <field name="RouteLen" editable="1"/>
-        <field name="Sort" editable="1"/>
-        <field name="Source" editable="1"/>
-        <field name="begin" editable="1"/>
-        <field name="day" editable="1"/>
-        <field name="descriptio" editable="1"/>
-        <field name="distance" editable="1"/>
-        <field name="end" editable="1"/>
-        <field name="length_km" editable="1"/>
-        <field name="length_m" editable="1"/>
-        <field name="org_fid" editable="1"/>
-        <field name="quadrant" editable="1"/>
-        <field name="timestamp" editable="1"/>
+        <field editable="1" name="Distance"/>
+        <field editable="1" name="Name"/>
+        <field editable="1" name="RouteLen"/>
+        <field editable="1" name="Sort"/>
+        <field editable="1" name="Source"/>
+        <field editable="1" name="begin"/>
+        <field editable="1" name="day"/>
+        <field editable="1" name="descriptio"/>
+        <field editable="1" name="distance"/>
+        <field editable="1" name="end"/>
+        <field editable="1" name="length_km"/>
+        <field editable="1" name="length_m"/>
+        <field editable="1" name="org_fid"/>
+        <field editable="1" name="quadrant"/>
+        <field editable="1" name="timestamp"/>
       </editable>
       <labelOnTop>
-        <field name="Distance" labelOnTop="0"/>
-        <field name="Name" labelOnTop="0"/>
-        <field name="RouteLen" labelOnTop="0"/>
-        <field name="Sort" labelOnTop="0"/>
-        <field name="Source" labelOnTop="0"/>
-        <field name="begin" labelOnTop="0"/>
-        <field name="day" labelOnTop="0"/>
-        <field name="descriptio" labelOnTop="0"/>
-        <field name="distance" labelOnTop="0"/>
-        <field name="end" labelOnTop="0"/>
-        <field name="length_km" labelOnTop="0"/>
-        <field name="length_m" labelOnTop="0"/>
-        <field name="org_fid" labelOnTop="0"/>
-        <field name="quadrant" labelOnTop="0"/>
-        <field name="timestamp" labelOnTop="0"/>
+        <field labelOnTop="0" name="Distance"/>
+        <field labelOnTop="0" name="Name"/>
+        <field labelOnTop="0" name="RouteLen"/>
+        <field labelOnTop="0" name="Sort"/>
+        <field labelOnTop="0" name="Source"/>
+        <field labelOnTop="0" name="begin"/>
+        <field labelOnTop="0" name="day"/>
+        <field labelOnTop="0" name="descriptio"/>
+        <field labelOnTop="0" name="distance"/>
+        <field labelOnTop="0" name="end"/>
+        <field labelOnTop="0" name="length_km"/>
+        <field labelOnTop="0" name="length_m"/>
+        <field labelOnTop="0" name="org_fid"/>
+        <field labelOnTop="0" name="quadrant"/>
+        <field labelOnTop="0" name="timestamp"/>
       </labelOnTop>
       <reuseLastValue>
-        <field name="Distance" reuseLastValue="0"/>
-        <field name="Name" reuseLastValue="0"/>
-        <field name="RouteLen" reuseLastValue="0"/>
-        <field name="Sort" reuseLastValue="0"/>
-        <field name="Source" reuseLastValue="0"/>
-        <field name="begin" reuseLastValue="0"/>
-        <field name="day" reuseLastValue="0"/>
-        <field name="descriptio" reuseLastValue="0"/>
-        <field name="distance" reuseLastValue="0"/>
-        <field name="end" reuseLastValue="0"/>
-        <field name="length_km" reuseLastValue="0"/>
-        <field name="length_m" reuseLastValue="0"/>
-        <field name="org_fid" reuseLastValue="0"/>
-        <field name="quadrant" reuseLastValue="0"/>
-        <field name="timestamp" reuseLastValue="0"/>
+        <field reuseLastValue="0" name="Distance"/>
+        <field reuseLastValue="0" name="Name"/>
+        <field reuseLastValue="0" name="RouteLen"/>
+        <field reuseLastValue="0" name="Sort"/>
+        <field reuseLastValue="0" name="Source"/>
+        <field reuseLastValue="0" name="begin"/>
+        <field reuseLastValue="0" name="day"/>
+        <field reuseLastValue="0" name="descriptio"/>
+        <field reuseLastValue="0" name="distance"/>
+        <field reuseLastValue="0" name="end"/>
+        <field reuseLastValue="0" name="length_km"/>
+        <field reuseLastValue="0" name="length_m"/>
+        <field reuseLastValue="0" name="org_fid"/>
+        <field reuseLastValue="0" name="quadrant"/>
+        <field reuseLastValue="0" name="timestamp"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>COALESCE("Text", '&lt;NULL>')</previewExpression>
       <mapTip>Text</mapTip>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" simplifyLocal="1" autoRefreshTime="0" wkbType="MultiPolygon" simplifyDrawingHints="1" type="vector" symbologyReferenceScale="-1" minScale="100000000" legendPlaceholderImage="" refreshOnNotifyEnabled="0" labelsEnabled="0" maxScale="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" refreshOnNotifyMessage="" readOnly="0" geometry="Polygon" autoRefreshEnabled="0" simplifyDrawingTol="1">
+    <maplayer simplifyLocal="1" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1" legendPlaceholderImage="" symbologyReferenceScale="-1" readOnly="0" refreshOnNotifyEnabled="0" minScale="100000000" maxScale="0" type="vector" autoRefreshTime="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="0" styleCategories="AllStyleCategories" geometry="Polygon" autoRefreshEnabled="0" wkbType="MultiPolygon">
       <extent>
         <xmin>18.40435736428151614</xmin>
         <ymin>-33.90613600950420903</ymin>
@@ -23889,58 +23908,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" startExpression="" mode="0" limitMode="0" endField="" fixedDuration="0" accumulate="0" durationUnit="min" startField="" endExpression="" enabled="0">
+      <temporal durationField="" fixedDuration="0" accumulate="0" endField="" startField="" enabled="0" startExpression="" endExpression="" durationUnit="min" mode="0" limitMode="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" zscale="1" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" binding="Centroid" type="IndividualFeatures" symbology="Line" extrusion="0" zoffset="0">
+      <elevation extrusionEnabled="0" symbology="Line" type="IndividualFeatures" zscale="1" clamping="Terrain" showMarkerSymbolInSurfacePlots="0" zoffset="0" extrusion="0" respectLayerSymbol="1" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="229,182,54,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="229,182,54,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -23971,36 +23990,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="229,182,54,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="164,130,39,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="229,182,54,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="164,130,39,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="229,182,54,255"/>
@@ -24015,44 +24034,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="229,182,54,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="164,130,39,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="229,182,54,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="diamond" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="164,130,39,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="3" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -24075,38 +24094,38 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" type="singleSymbol" symbollevels="0" referencescale="-1" enableorderby="0">
+      <renderer-v2 enableorderby="0" type="singleSymbol" symbollevels="0" referencescale="-1" forceraster="0">
         <symbols>
-          <symbol is_animated="0" type="fill" name="0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="114,155,111,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="114,155,111,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.26" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="114,155,111,255"/>
@@ -24121,9 +24140,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -24134,22 +24153,22 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option value="&quot;id&quot;" type="QString" name="dualview/previewExpressions"/>
+          <Option type="QString" value="copy" name="QFieldSync/action"/>
+          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="&quot;id&quot;" name="dualview/previewExpressions"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks type="StringList">
-          <Option value="" type="QString"/>
+          <Option type="QString" value=""/>
         </activeChecks>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field configurationFlags="None" name="id">
@@ -24175,34 +24194,34 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
-        <alias index="1" name="" field="area"/>
-        <alias index="2" name="" field="rotation"/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="area" name=""/>
+        <alias index="2" field="rotation" name=""/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="area"/>
-        <default applyOnUpdate="0" expression="" field="rotation"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="area" expression=""/>
+        <default applyOnUpdate="0" field="rotation" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="id" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="area" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="rotation" constraints="0"/>
+        <constraint exp_strength="0" field="id" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="area" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="rotation" notnull_strength="0" constraints="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" desc="" field="id"/>
-        <constraint exp="" desc="" field="area"/>
-        <constraint exp="" desc="" field="rotation"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="area" desc=""/>
+        <constraint exp="" field="rotation" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="&quot;rotation&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="&quot;rotation&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column width="-1" type="field" name="id" hidden="0"/>
-          <column width="-1" type="field" name="area" hidden="0"/>
-          <column width="-1" type="field" name="rotation" hidden="0"/>
+          <column width="-1" type="field" hidden="0" name="id"/>
+          <column width="-1" type="field" hidden="0" name="area"/>
+          <column width="-1" type="field" hidden="0" name="rotation"/>
           <column width="-1" type="actions" hidden="1"/>
         </columns>
       </attributetableconfig>
@@ -24226,7 +24245,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>"id"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" simplifyLocal="1" autoRefreshTime="0" wkbType="Point" simplifyDrawingHints="0" type="vector" symbologyReferenceScale="-1" minScale="100000000" legendPlaceholderImage="" refreshOnNotifyEnabled="0" labelsEnabled="0" maxScale="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" refreshOnNotifyMessage="" readOnly="0" geometry="Point" autoRefreshEnabled="0" simplifyDrawingTol="1">
+    <maplayer simplifyLocal="1" simplifyDrawingHints="0" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1" legendPlaceholderImage="" symbologyReferenceScale="-1" readOnly="0" refreshOnNotifyEnabled="0" minScale="100000000" maxScale="0" type="vector" autoRefreshTime="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="0" styleCategories="AllStyleCategories" geometry="Point" autoRefreshEnabled="0" wkbType="Point">
       <extent>
         <xmin>18.38475260238231712</xmin>
         <ymin>-33.92228210414224776</ymin>
@@ -24291,7 +24310,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxy="0" minz="0" dimensions="2" maxx="0" maxz="0" miny="0" minx="0" crs=""/>
+          <spatial maxz="0" minx="0" maxx="0" minz="0" crs="" miny="0" maxy="0" dimensions="2"/>
           <temporal>
             <period>
               <start></start>
@@ -24316,58 +24335,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" startExpression="" mode="0" limitMode="0" endField="" fixedDuration="0" accumulate="0" durationUnit="min" startField="" endExpression="" enabled="0">
+      <temporal durationField="" fixedDuration="0" accumulate="0" endField="" startField="" enabled="0" startExpression="" endExpression="" durationUnit="min" mode="0" limitMode="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" zscale="1" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" binding="Centroid" type="IndividualFeatures" symbology="Line" extrusion="0" zoffset="0">
+      <elevation extrusionEnabled="0" symbology="Line" type="IndividualFeatures" zscale="1" clamping="Terrain" showMarkerSymbolInSurfacePlots="0" zoffset="0" extrusion="0" respectLayerSymbol="1" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="196,60,57,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="196,60,57,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -24398,36 +24417,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="196,60,57,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="140,43,41,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="196,60,57,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="140,43,41,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="196,60,57,255"/>
@@ -24442,44 +24461,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="196,60,57,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="140,43,41,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="196,60,57,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="diamond" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="140,43,41,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="3" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -24502,49 +24521,49 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" type="RuleRenderer" symbollevels="0" referencescale="-1" enableorderby="0">
+      <renderer-v2 enableorderby="0" type="RuleRenderer" symbollevels="0" referencescale="-1" forceraster="0">
         <rules key="{01115dc1-cc6e-4980-a968-7ef94a3b9df6}">
-          <rule symbol="0" label="All distances" checkstate="0" key="{e9652330-031e-4b93-b5b4-4caae12a21f9}"/>
+          <rule symbol="0" label="All distances" key="{e9652330-031e-4b93-b5b4-4caae12a21f9}" checkstate="0"/>
         </rules>
         <symbols>
-          <symbol is_animated="0" type="marker" name="0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="1" pass="0" class="SimpleMarker" enabled="1">
+            <layer locked="1" class="SimpleMarker" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="0,0,0,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="circle" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,0" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="0.5" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="0,0,0,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="circle" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="35,35,35,0" name="outline_color"/>
+                <Option type="QString" value="no" name="outline_style"/>
+                <Option type="QString" value="0" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="0.5" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -24567,20 +24586,20 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option type="Map" name="properties">
                     <Option type="Map" name="fillColor">
-                      <Option value="true" type="bool" name="active"/>
-                      <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" type="QString" name="expression"/>
-                      <Option value="3" type="int" name="type"/>
+                      <Option type="bool" value="true" name="active"/>
+                      <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '#d22027'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '#672290'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '#91d337'&#xa;ELSE '#000000'&#xa;END" name="expression"/>
+                      <Option type="int" value="3" name="type"/>
                     </Option>
                     <Option type="Map" name="size">
-                      <Option value="false" type="bool" name="active"/>
-                      <Option value="1" type="int" name="type"/>
-                      <Option value="" type="QString" name="val"/>
+                      <Option type="bool" value="false" name="active"/>
+                      <Option type="int" value="1" name="type"/>
+                      <Option type="QString" value="" name="val"/>
                     </Option>
                   </Option>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -24592,15 +24611,15 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="copy" name="QFieldSync/action"/>
+          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
           <Option type="StringList" name="dualview/previewExpressions">
-            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )"/>
           </Option>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="QString" value="0" name="embeddedWidgets/count"/>
           <Option type="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -24608,48 +24627,48 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory penAlpha="255" width="15" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" minimumSize="0" enabled="0" maxScaleDenominator="1e+08" diagramOrientation="Up" opacity="1" scaleBasedVisibility="0" spacingUnit="MM" minScaleDenominator="0" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" lineSizeType="MM" penWidth="0" backgroundAlpha="255" scaleDependency="Area" spacing="0" direction="1" barWidth="5" sizeType="MM" height="15" penColor="#000000" showAxis="0">
-          <fontProperties bold="0" style="" italic="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0"/>
-          <attribute label="" colorOpacity="1" field="" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory height="15" scaleDependency="Area" width="15" lineSizeScale="3x:0,0,0,0,0,0" spacingUnit="MM" lineSizeType="MM" penColor="#000000" spacing="0" labelPlacementMethod="XHeight" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" backgroundAlpha="255" maxScaleDenominator="1e+08" barWidth="5" penWidth="0" minimumSize="0" penAlpha="255" minScaleDenominator="0" sizeType="MM" backgroundColor="#ffffff" enabled="0" opacity="1" direction="1" scaleBasedVisibility="0" showAxis="0" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270">
+          <fontProperties style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0" strikethrough="0" italic="0" underline="0" bold="0"/>
+          <attribute color="#000000" field="" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="35,35,35,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0.26" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -24680,9 +24699,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -24690,20 +24709,20 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" showAll="1" placement="0" zIndex="0" dist="0" priority="0" obstacle="0">
+      <DiagramLayerSettings priority="0" linePlacementFlags="18" obstacle="0" dist="0" zIndex="0" placement="0" showAll="1">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field configurationFlags="None" name="Name">
@@ -24731,8 +24750,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -24748,8 +24767,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -24758,8 +24777,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -24808,85 +24827,85 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="Name"/>
-        <alias index="1" name="" field="descriptio"/>
-        <alias index="2" name="" field="timestamp"/>
-        <alias index="3" name="" field="begin"/>
-        <alias index="4" name="" field="end"/>
-        <alias index="5" name="" field="RouteLen"/>
-        <alias index="6" name="" field="Source"/>
-        <alias index="7" name="" field="length_m"/>
-        <alias index="8" name="" field="length_km"/>
-        <alias index="9" name="" field="org_fid"/>
-        <alias index="10" name="" field="distance"/>
-        <alias index="11" name="" field="first_runn"/>
-        <alias index="12" name="" field="last_runne"/>
+        <alias index="0" field="Name" name=""/>
+        <alias index="1" field="descriptio" name=""/>
+        <alias index="2" field="timestamp" name=""/>
+        <alias index="3" field="begin" name=""/>
+        <alias index="4" field="end" name=""/>
+        <alias index="5" field="RouteLen" name=""/>
+        <alias index="6" field="Source" name=""/>
+        <alias index="7" field="length_m" name=""/>
+        <alias index="8" field="length_km" name=""/>
+        <alias index="9" field="org_fid" name=""/>
+        <alias index="10" field="distance" name=""/>
+        <alias index="11" field="first_runn" name=""/>
+        <alias index="12" field="last_runne" name=""/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="Name"/>
-        <default applyOnUpdate="0" expression="" field="descriptio"/>
-        <default applyOnUpdate="0" expression="" field="timestamp"/>
-        <default applyOnUpdate="0" expression="" field="begin"/>
-        <default applyOnUpdate="0" expression="" field="end"/>
-        <default applyOnUpdate="0" expression="" field="RouteLen"/>
-        <default applyOnUpdate="0" expression="" field="Source"/>
-        <default applyOnUpdate="0" expression="" field="length_m"/>
-        <default applyOnUpdate="0" expression="" field="length_km"/>
-        <default applyOnUpdate="0" expression="" field="org_fid"/>
-        <default applyOnUpdate="0" expression="" field="distance"/>
-        <default applyOnUpdate="0" expression="" field="first_runn"/>
-        <default applyOnUpdate="0" expression="" field="last_runne"/>
+        <default applyOnUpdate="0" field="Name" expression=""/>
+        <default applyOnUpdate="0" field="descriptio" expression=""/>
+        <default applyOnUpdate="0" field="timestamp" expression=""/>
+        <default applyOnUpdate="0" field="begin" expression=""/>
+        <default applyOnUpdate="0" field="end" expression=""/>
+        <default applyOnUpdate="0" field="RouteLen" expression=""/>
+        <default applyOnUpdate="0" field="Source" expression=""/>
+        <default applyOnUpdate="0" field="length_m" expression=""/>
+        <default applyOnUpdate="0" field="length_km" expression=""/>
+        <default applyOnUpdate="0" field="org_fid" expression=""/>
+        <default applyOnUpdate="0" field="distance" expression=""/>
+        <default applyOnUpdate="0" field="first_runn" expression=""/>
+        <default applyOnUpdate="0" field="last_runne" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="Name" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="descriptio" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="timestamp" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="begin" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="end" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="RouteLen" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="Source" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="length_m" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="length_km" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="org_fid" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="distance" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="first_runn" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="last_runne" constraints="0"/>
+        <constraint exp_strength="0" field="Name" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="descriptio" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="timestamp" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="begin" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="end" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="RouteLen" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="Source" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="length_m" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="length_km" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="org_fid" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="distance" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="first_runn" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="last_runne" notnull_strength="0" constraints="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" desc="" field="Name"/>
-        <constraint exp="" desc="" field="descriptio"/>
-        <constraint exp="" desc="" field="timestamp"/>
-        <constraint exp="" desc="" field="begin"/>
-        <constraint exp="" desc="" field="end"/>
-        <constraint exp="" desc="" field="RouteLen"/>
-        <constraint exp="" desc="" field="Source"/>
-        <constraint exp="" desc="" field="length_m"/>
-        <constraint exp="" desc="" field="length_km"/>
-        <constraint exp="" desc="" field="org_fid"/>
-        <constraint exp="" desc="" field="distance"/>
-        <constraint exp="" desc="" field="first_runn"/>
-        <constraint exp="" desc="" field="last_runne"/>
+        <constraint exp="" field="Name" desc=""/>
+        <constraint exp="" field="descriptio" desc=""/>
+        <constraint exp="" field="timestamp" desc=""/>
+        <constraint exp="" field="begin" desc=""/>
+        <constraint exp="" field="end" desc=""/>
+        <constraint exp="" field="RouteLen" desc=""/>
+        <constraint exp="" field="Source" desc=""/>
+        <constraint exp="" field="length_m" desc=""/>
+        <constraint exp="" field="length_km" desc=""/>
+        <constraint exp="" field="org_fid" desc=""/>
+        <constraint exp="" field="distance" desc=""/>
+        <constraint exp="" field="first_runn" desc=""/>
+        <constraint exp="" field="last_runne" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="&quot;first_runn&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="&quot;first_runn&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column width="179" type="field" name="begin" hidden="0"/>
-          <column width="-1" type="field" name="RouteLen" hidden="0"/>
-          <column width="-1" type="field" name="Source" hidden="0"/>
+          <column width="179" type="field" hidden="0" name="begin"/>
+          <column width="-1" type="field" hidden="0" name="RouteLen"/>
+          <column width="-1" type="field" hidden="0" name="Source"/>
           <column width="-1" type="actions" hidden="1"/>
-          <column width="-1" type="field" name="Name" hidden="0"/>
-          <column width="-1" type="field" name="length_m" hidden="0"/>
-          <column width="-1" type="field" name="length_km" hidden="0"/>
-          <column width="-1" type="field" name="org_fid" hidden="0"/>
-          <column width="-1" type="field" name="first_runn" hidden="0"/>
-          <column width="-1" type="field" name="last_runne" hidden="0"/>
-          <column width="-1" type="field" name="descriptio" hidden="0"/>
-          <column width="-1" type="field" name="timestamp" hidden="0"/>
-          <column width="-1" type="field" name="end" hidden="0"/>
-          <column width="-1" type="field" name="distance" hidden="0"/>
+          <column width="-1" type="field" hidden="0" name="Name"/>
+          <column width="-1" type="field" hidden="0" name="length_m"/>
+          <column width="-1" type="field" hidden="0" name="length_km"/>
+          <column width="-1" type="field" hidden="0" name="org_fid"/>
+          <column width="-1" type="field" hidden="0" name="first_runn"/>
+          <column width="-1" type="field" hidden="0" name="last_runne"/>
+          <column width="-1" type="field" hidden="0" name="descriptio"/>
+          <column width="-1" type="field" hidden="0" name="timestamp"/>
+          <column width="-1" type="field" hidden="0" name="end"/>
+          <column width="-1" type="field" hidden="0" name="distance"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -24918,58 +24937,58 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="Distance" editable="1"/>
-        <field name="Name" editable="1"/>
-        <field name="RouteLen" editable="1"/>
-        <field name="Source" editable="1"/>
-        <field name="auxiliary_storage_labeling_positionx" editable="0"/>
-        <field name="auxiliary_storage_labeling_positiony" editable="0"/>
-        <field name="begin" editable="1"/>
-        <field name="descriptio" editable="1"/>
-        <field name="display" editable="1"/>
-        <field name="distance" editable="1"/>
-        <field name="distance_1" editable="1"/>
-        <field name="end" editable="1"/>
-        <field name="first_run" editable="1"/>
-        <field name="first_runn" editable="1"/>
-        <field name="first_runner" editable="1"/>
-        <field name="first_runner_s" editable="1"/>
-        <field name="last_run" editable="0"/>
-        <field name="last_runn" editable="1"/>
-        <field name="last_runne" editable="1"/>
-        <field name="last_runner" editable="1"/>
-        <field name="last_runner_s" editable="1"/>
-        <field name="length_km" editable="1"/>
-        <field name="length_m" editable="1"/>
-        <field name="org_fid" editable="1"/>
-        <field name="timestamp" editable="1"/>
+        <field editable="1" name="Distance"/>
+        <field editable="1" name="Name"/>
+        <field editable="1" name="RouteLen"/>
+        <field editable="1" name="Source"/>
+        <field editable="0" name="auxiliary_storage_labeling_positionx"/>
+        <field editable="0" name="auxiliary_storage_labeling_positiony"/>
+        <field editable="1" name="begin"/>
+        <field editable="1" name="descriptio"/>
+        <field editable="1" name="display"/>
+        <field editable="1" name="distance"/>
+        <field editable="1" name="distance_1"/>
+        <field editable="1" name="end"/>
+        <field editable="1" name="first_run"/>
+        <field editable="1" name="first_runn"/>
+        <field editable="1" name="first_runner"/>
+        <field editable="1" name="first_runner_s"/>
+        <field editable="0" name="last_run"/>
+        <field editable="1" name="last_runn"/>
+        <field editable="1" name="last_runne"/>
+        <field editable="1" name="last_runner"/>
+        <field editable="1" name="last_runner_s"/>
+        <field editable="1" name="length_km"/>
+        <field editable="1" name="length_m"/>
+        <field editable="1" name="org_fid"/>
+        <field editable="1" name="timestamp"/>
       </editable>
       <labelOnTop>
-        <field name="Distance" labelOnTop="0"/>
-        <field name="Name" labelOnTop="0"/>
-        <field name="RouteLen" labelOnTop="0"/>
-        <field name="Source" labelOnTop="0"/>
-        <field name="auxiliary_storage_labeling_positionx" labelOnTop="0"/>
-        <field name="auxiliary_storage_labeling_positiony" labelOnTop="0"/>
-        <field name="begin" labelOnTop="0"/>
-        <field name="descriptio" labelOnTop="0"/>
-        <field name="display" labelOnTop="0"/>
-        <field name="distance" labelOnTop="0"/>
-        <field name="distance_1" labelOnTop="0"/>
-        <field name="end" labelOnTop="0"/>
-        <field name="first_run" labelOnTop="0"/>
-        <field name="first_runn" labelOnTop="0"/>
-        <field name="first_runner" labelOnTop="0"/>
-        <field name="first_runner_s" labelOnTop="0"/>
-        <field name="last_run" labelOnTop="0"/>
-        <field name="last_runn" labelOnTop="0"/>
-        <field name="last_runne" labelOnTop="0"/>
-        <field name="last_runner" labelOnTop="0"/>
-        <field name="last_runner_s" labelOnTop="0"/>
-        <field name="length_km" labelOnTop="0"/>
-        <field name="length_m" labelOnTop="0"/>
-        <field name="org_fid" labelOnTop="0"/>
-        <field name="timestamp" labelOnTop="0"/>
+        <field labelOnTop="0" name="Distance"/>
+        <field labelOnTop="0" name="Name"/>
+        <field labelOnTop="0" name="RouteLen"/>
+        <field labelOnTop="0" name="Source"/>
+        <field labelOnTop="0" name="auxiliary_storage_labeling_positionx"/>
+        <field labelOnTop="0" name="auxiliary_storage_labeling_positiony"/>
+        <field labelOnTop="0" name="begin"/>
+        <field labelOnTop="0" name="descriptio"/>
+        <field labelOnTop="0" name="display"/>
+        <field labelOnTop="0" name="distance"/>
+        <field labelOnTop="0" name="distance_1"/>
+        <field labelOnTop="0" name="end"/>
+        <field labelOnTop="0" name="first_run"/>
+        <field labelOnTop="0" name="first_runn"/>
+        <field labelOnTop="0" name="first_runner"/>
+        <field labelOnTop="0" name="first_runner_s"/>
+        <field labelOnTop="0" name="last_run"/>
+        <field labelOnTop="0" name="last_runn"/>
+        <field labelOnTop="0" name="last_runne"/>
+        <field labelOnTop="0" name="last_runner"/>
+        <field labelOnTop="0" name="last_runner_s"/>
+        <field labelOnTop="0" name="length_km"/>
+        <field labelOnTop="0" name="length_m"/>
+        <field labelOnTop="0" name="org_fid"/>
+        <field labelOnTop="0" name="timestamp"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -24977,7 +24996,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" simplifyLocal="1" autoRefreshTime="0" wkbType="MultiLineString" simplifyDrawingHints="1" type="vector" symbologyReferenceScale="-1" minScale="100000000" legendPlaceholderImage="" refreshOnNotifyEnabled="0" labelsEnabled="0" maxScale="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" refreshOnNotifyMessage="" readOnly="0" geometry="Line" autoRefreshEnabled="0" simplifyDrawingTol="1">
+    <maplayer simplifyLocal="1" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1" legendPlaceholderImage="" symbologyReferenceScale="-1" readOnly="0" refreshOnNotifyEnabled="0" minScale="100000000" maxScale="0" type="vector" autoRefreshTime="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="0" styleCategories="AllStyleCategories" geometry="Line" autoRefreshEnabled="0" wkbType="MultiLineString">
       <extent>
         <xmin>18.40189262273444371</xmin>
         <ymin>-33.90990359999999981</ymin>
@@ -25050,58 +25069,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" startExpression="" mode="0" limitMode="0" endField="" fixedDuration="0" accumulate="0" durationUnit="min" startField="" endExpression="" enabled="0">
+      <temporal durationField="" fixedDuration="0" accumulate="0" endField="" startField="" enabled="0" startExpression="" endExpression="" durationUnit="min" mode="0" limitMode="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" zscale="1" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" binding="Centroid" type="IndividualFeatures" symbology="Line" extrusion="0" zoffset="0">
+      <elevation extrusionEnabled="0" symbology="Line" type="IndividualFeatures" zscale="1" clamping="Terrain" showMarkerSymbolInSurfacePlots="0" zoffset="0" extrusion="0" respectLayerSymbol="1" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="190,178,151,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="190,178,151,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -25132,36 +25151,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="190,178,151,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="136,127,108,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="190,178,151,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="136,127,108,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="190,178,151,255"/>
@@ -25176,44 +25195,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="190,178,151,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="136,127,108,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="190,178,151,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="diamond" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="136,127,108,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="3" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -25236,58 +25255,58 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" type="RuleRenderer" symbollevels="0" referencescale="-1" enableorderby="0">
+      <renderer-v2 enableorderby="0" type="RuleRenderer" symbollevels="0" referencescale="-1" forceraster="0">
         <rules key="{5bddb61b-4527-4f61-bf00-ae5121d1f9fd}">
-          <rule filter="&quot;type&quot; IS 'car'" symbol="0" label="Car" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}"/>
-          <rule filter="&quot;type&quot; IS 'walk'" symbol="1" label="Walking" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}"/>
+          <rule symbol="0" label="Car" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}" filter="&quot;type&quot; IS 'car'"/>
+          <rule symbol="1" label="Walking" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}" filter="&quot;type&quot; IS 'walk'"/>
         </rules>
         <symbols>
-          <symbol is_animated="0" type="line" name="0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="0">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="123,211,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="1" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="123,211,0,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="1" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -25318,50 +25337,50 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" type="line" name="1" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="flat" type="QString" name="capstyle"/>
-                <Option value="4;1;1;1" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="103,34,144,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="1.25" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="1" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="flat" name="capstyle"/>
+                <Option type="QString" value="4;1;1;1" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="103,34,144,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="1.25" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="1" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="flat"/>
@@ -25392,30 +25411,30 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" class="MarkerLine" enabled="1">
+            <layer locked="0" class="MarkerLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="4" type="QString" name="average_angle_length"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="average_angle_map_unit_scale"/>
-                <Option value="MM" type="QString" name="average_angle_unit"/>
-                <Option value="3" type="QString" name="interval"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="interval_map_unit_scale"/>
-                <Option value="MM" type="QString" name="interval_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="0" type="QString" name="offset_along_line"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_along_line_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_along_line_unit"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="true" type="bool" name="place_on_every_part"/>
-                <Option value="LastVertex" type="QString" name="placements"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="1" type="QString" name="rotate"/>
+                <Option type="QString" value="4" name="average_angle_length"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="average_angle_map_unit_scale"/>
+                <Option type="QString" value="MM" name="average_angle_unit"/>
+                <Option type="QString" value="3" name="interval"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="interval_map_unit_scale"/>
+                <Option type="QString" value="MM" name="interval_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="0" name="offset_along_line"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_along_line_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_along_line_unit"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="bool" value="true" name="place_on_every_part"/>
+                <Option type="QString" value="LastVertex" name="placements"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="1" name="rotate"/>
               </Option>
               <prop k="average_angle_length" v="4"/>
               <prop k="average_angle_map_unit_scale" v="3x:0,0,0,0,0,0"/>
@@ -25435,33 +25454,33 @@ def my_form_open(dialog, layer, feature):
               <prop k="rotate" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" type="marker" name="@1@1" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+              <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@1@1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="FilledMarker" enabled="1">
+                <layer locked="0" class="FilledMarker" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="0" type="QString" name="angle"/>
-                    <Option value="103,34,144,255" type="QString" name="color"/>
-                    <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                    <Option value="filled_arrowhead" type="QString" name="name"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="diameter" type="QString" name="scale_method"/>
-                    <Option value="5" type="QString" name="size"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="size_unit"/>
-                    <Option value="1" type="QString" name="vertical_anchor_point"/>
+                    <Option type="QString" value="0" name="angle"/>
+                    <Option type="QString" value="103,34,144,255" name="color"/>
+                    <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                    <Option type="QString" value="filled_arrowhead" name="name"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="diameter" name="scale_method"/>
+                    <Option type="QString" value="5" name="size"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="size_unit"/>
+                    <Option type="QString" value="1" name="vertical_anchor_point"/>
                   </Option>
                   <prop k="angle" v="0"/>
                   <prop k="color" v="103,34,144,255"/>
@@ -25477,32 +25496,32 @@ def my_form_open(dialog, layer, feature):
                   <prop k="vertical_anchor_point" v="1"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol is_animated="0" type="fill" name="@@1@1@0" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+                  <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="@@1@1@0">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="103,34,144,255" type="QString" name="color"/>
-                        <Option value="miter" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                        <Option value="no" type="QString" name="outline_style"/>
-                        <Option value="0" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="103,34,144,255" name="color"/>
+                        <Option type="QString" value="miter" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                        <Option type="QString" value="no" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="103,34,144,255"/>
@@ -25517,9 +25536,9 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -25532,11 +25551,11 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option value="id" type="QString" name="dualview/previewExpressions"/>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="QString" value="copy" name="QFieldSync/action"/>
+          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="id" name="dualview/previewExpressions"/>
+          <Option type="QString" value="0" name="embeddedWidgets/count"/>
           <Option type="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -25544,48 +25563,48 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory penAlpha="255" width="15" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" minimumSize="0" enabled="0" maxScaleDenominator="1e+08" diagramOrientation="Up" opacity="1" scaleBasedVisibility="0" spacingUnit="MM" minScaleDenominator="0" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" lineSizeType="MM" penWidth="0" backgroundAlpha="255" scaleDependency="Area" spacing="0" direction="1" barWidth="5" sizeType="MM" height="15" penColor="#000000" showAxis="0">
-          <fontProperties bold="0" style="0" italic="1" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" strikethrough="0"/>
-          <attribute label="" colorOpacity="1" field="" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory height="15" scaleDependency="Area" width="15" lineSizeScale="3x:0,0,0,0,0,0" spacingUnit="MM" lineSizeType="MM" penColor="#000000" spacing="0" labelPlacementMethod="XHeight" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" backgroundAlpha="255" maxScaleDenominator="1e+08" barWidth="5" penWidth="0" minimumSize="0" penAlpha="255" minScaleDenominator="0" sizeType="MM" backgroundColor="#ffffff" enabled="0" opacity="1" direction="1" scaleBasedVisibility="0" showAxis="0" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270">
+          <fontProperties style="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" strikethrough="0" italic="1" underline="0" bold="0"/>
+          <attribute color="#000000" field="" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="35,35,35,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0.26" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -25616,9 +25635,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -25626,20 +25645,20 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" showAll="1" placement="2" zIndex="0" dist="0" priority="0" obstacle="0">
+      <DiagramLayerSettings priority="0" linePlacementFlags="18" obstacle="0" dist="0" zIndex="0" placement="2" showAll="1">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field configurationFlags="None" name="id">
@@ -25658,30 +25677,30 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
-        <alias index="1" name="" field="type"/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="type" name=""/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="type"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="type" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="id" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="type" constraints="0"/>
+        <constraint exp_strength="0" field="id" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="type" notnull_strength="0" constraints="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" desc="" field="id"/>
-        <constraint exp="" desc="" field="type"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="type" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column width="-1" type="field" name="id" hidden="0"/>
+          <column width="-1" type="field" hidden="0" name="id"/>
           <column width="-1" type="actions" hidden="1"/>
-          <column width="-1" type="field" name="type" hidden="0"/>
+          <column width="-1" type="field" hidden="0" name="type"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -25713,12 +25732,12 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="id" editable="1"/>
-        <field name="type" editable="1"/>
+        <field editable="1" name="id"/>
+        <field editable="1" name="type"/>
       </editable>
       <labelOnTop>
-        <field name="id" labelOnTop="0"/>
-        <field name="type" labelOnTop="0"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="type"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -25726,7 +25745,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" simplifyLocal="1" autoRefreshTime="0" wkbType="Point" simplifyDrawingHints="0" type="vector" symbologyReferenceScale="-1" minScale="100000000" legendPlaceholderImage="" refreshOnNotifyEnabled="0" labelsEnabled="1" maxScale="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" refreshOnNotifyMessage="" readOnly="0" geometry="Point" autoRefreshEnabled="0" simplifyDrawingTol="1">
+    <maplayer simplifyLocal="1" simplifyDrawingHints="0" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1" legendPlaceholderImage="" symbologyReferenceScale="-1" readOnly="0" refreshOnNotifyEnabled="0" minScale="100000000" maxScale="0" type="vector" autoRefreshTime="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="1" styleCategories="AllStyleCategories" geometry="Point" autoRefreshEnabled="0" wkbType="Point">
       <extent>
         <xmin>18.4043294703937228</xmin>
         <ymin>-33.90631712958812471</ymin>
@@ -25799,58 +25818,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" startExpression="" mode="0" limitMode="0" endField="" fixedDuration="0" accumulate="0" durationUnit="min" startField="" endExpression="" enabled="0">
+      <temporal durationField="" fixedDuration="0" accumulate="0" endField="" startField="" enabled="0" startExpression="" endExpression="" durationUnit="min" mode="0" limitMode="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" zscale="1" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" binding="Centroid" type="IndividualFeatures" symbology="Line" extrusion="0" zoffset="0">
+      <elevation extrusionEnabled="0" symbology="Line" type="IndividualFeatures" zscale="1" clamping="Terrain" showMarkerSymbolInSurfacePlots="0" zoffset="0" extrusion="0" respectLayerSymbol="1" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="145,82,45,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="145,82,45,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -25881,36 +25900,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="145,82,45,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="104,59,32,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="145,82,45,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="104,59,32,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="145,82,45,255"/>
@@ -25925,44 +25944,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="145,82,45,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="104,59,32,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="145,82,45,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="diamond" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="104,59,32,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="3" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -25985,44 +26004,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" type="nullSymbol" symbollevels="0" referencescale="-1" enableorderby="0"/>
+      <renderer-v2 enableorderby="0" type="nullSymbol" symbollevels="0" referencescale="-1" forceraster="0"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="63" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="1" fieldName="label" useSubstitutions="0" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="15" namedStyle="Semibold" forcedItalic="0" isExpression="0" fontSizeUnit="Point" allowHtml="0" legendString="Aa">
+          <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="Semibold" fontUnderline="0" fieldName="label" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" useSubstitutions="0" fontWeight="63" fontStrikeout="0" fontItalic="0" fontSize="15" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" isExpression="0" legendString="Aa" textOrientation="horizontal">
             <families/>
-            <text-buffer bufferNoFill="1" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferDraw="1" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="0"/>
-            <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeBorderWidth="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-              <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <text-buffer bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+            <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskType="0"/>
+            <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
+              <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                    <Option value="255,255,255,255" type="QString" name="color"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                    <Option value="no" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="solid" type="QString" name="style"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                    <Option type="QString" value="255,255,255,255" name="color"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                    <Option type="QString" value="no" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="solid" name="style"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -26037,66 +26056,66 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+            <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format useMaxLineLengthForAutoWrap="1" leftDirectionSymbol="&lt;" wrapChar="" multilineAlign="3" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" decimals="3" rightDirectionSymbol=">" formatNumbers="0"/>
-          <placement overlapHandling="PreventOverlap" lineAnchorType="0" centroidInside="0" overrunDistance="0" centroidWhole="0" geometryGeneratorEnabled="0" rotationAngle="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" geometryGeneratorType="PointGeometry" quadOffset="4" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="0" xOffset="0" allowDegraded="0" lineAnchorTextPoint="CenterOfText" layerType="UnknownGeometry" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" maxCurvedCharAngleOut="-25" repeatDistance="0" offsetUnits="MM" repeatDistanceUnits="MM" dist="0" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" distUnits="MM" lineAnchorClipping="0" placementFlags="10" priority="5" overrunDistanceUnit="MM" maxCurvedCharAngleIn="25" geometryGenerator="" lineAnchorPercent="0.5" yOffset="0" rotationUnit="AngleDegrees"/>
-          <rendering fontMaxPixelSize="10000" drawLabels="1" mergeLines="0" zIndex="0" upsidedownLabels="0" obstacleFactor="1" scaleVisibility="0" limitNumLabels="0" obstacleType="0" fontLimitPixelSize="0" maxNumLabels="2000" minFeatureSize="0" fontMinPixelSize="3" labelPerPart="0" obstacle="1" scaleMax="0" scaleMin="0" unplacedVisibility="0"/>
+          <text-format wrapChar="" rightDirectionSymbol=">" plussign="0" leftDirectionSymbol="&lt;" formatNumbers="0" decimals="3" multilineAlign="3" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
+          <placement offsetUnits="MM" xOffset="0" maxCurvedCharAngleOut="-25" layerType="UnknownGeometry" allowDegraded="0" yOffset="0" overlapHandling="PreventOverlap" geometryGeneratorType="PointGeometry" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" repeatDistanceUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25" quadOffset="4" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidWhole="0" overrunDistance="0" overrunDistanceUnit="MM" centroidInside="0" placement="0" geometryGenerator="" priority="5" distUnits="MM" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" dist="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorTextPoint="CenterOfText" polygonPlacementFlags="2" rotationUnit="AngleDegrees" offsetType="0" placementFlags="10" repeatDistance="0"/>
+          <rendering limitNumLabels="0" obstacleType="0" obstacle="1" scaleMax="0" maxNumLabels="2000" labelPerPart="0" scaleMin="0" upsidedownLabels="0" zIndex="0" unplacedVisibility="0" fontLimitPixelSize="0" minFeatureSize="0" fontMaxPixelSize="10000" scaleVisibility="0" fontMinPixelSize="3" drawLabels="1" mergeLines="0" obstacleFactor="1"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
           <callout type="simple">
             <Option type="Map">
-              <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-              <Option value="0" type="int" name="blendMode"/>
+              <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+              <Option type="int" value="0" name="blendMode"/>
               <Option type="Map" name="ddProperties">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
-              <Option value="false" type="bool" name="drawToAllParts"/>
-              <Option value="0" type="QString" name="enabled"/>
-              <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-              <Option value="&lt;symbol is_animated=&quot;0&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-              <Option value="0" type="double" name="minLength"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-              <Option value="MM" type="QString" name="minLengthUnit"/>
-              <Option value="0" type="double" name="offsetFromAnchor"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-              <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-              <Option value="0" type="double" name="offsetFromLabel"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-              <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+              <Option type="bool" value="false" name="drawToAllParts"/>
+              <Option type="QString" value="0" name="enabled"/>
+              <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
+              <Option type="QString" value="&lt;symbol alpha=&quot;1&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
+              <Option type="double" value="0" name="minLength"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
+              <Option type="QString" value="MM" name="minLengthUnit"/>
+              <Option type="double" value="0" name="offsetFromAnchor"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
+              <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
+              <Option type="double" value="0" name="offsetFromLabel"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
+              <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
             </Option>
           </callout>
         </settings>
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="QString" value="copy" name="QFieldSync/action"/>
+          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
+          <Option type="QString" value="0" name="embeddedWidgets/count"/>
           <Option type="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -26104,48 +26123,48 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory penAlpha="255" width="15" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" minimumSize="0" enabled="0" maxScaleDenominator="1e+08" diagramOrientation="Up" opacity="1" scaleBasedVisibility="0" spacingUnit="MM" minScaleDenominator="0" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" lineSizeType="MM" penWidth="0" backgroundAlpha="255" scaleDependency="Area" spacing="0" direction="1" barWidth="5" sizeType="MM" height="15" penColor="#000000" showAxis="0">
-          <fontProperties bold="0" style="0" italic="1" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" strikethrough="0"/>
-          <attribute label="" colorOpacity="1" field="" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory height="15" scaleDependency="Area" width="15" lineSizeScale="3x:0,0,0,0,0,0" spacingUnit="MM" lineSizeType="MM" penColor="#000000" spacing="0" labelPlacementMethod="XHeight" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" backgroundAlpha="255" maxScaleDenominator="1e+08" barWidth="5" penWidth="0" minimumSize="0" penAlpha="255" minScaleDenominator="0" sizeType="MM" backgroundColor="#ffffff" enabled="0" opacity="1" direction="1" scaleBasedVisibility="0" showAxis="0" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270">
+          <fontProperties style="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" strikethrough="0" italic="1" underline="0" bold="0"/>
+          <attribute color="#000000" field="" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="35,35,35,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0.26" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -26176,9 +26195,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -26186,20 +26205,20 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" showAll="1" placement="0" zIndex="0" dist="0" priority="0" obstacle="0">
+      <DiagramLayerSettings priority="0" linePlacementFlags="18" obstacle="0" dist="0" zIndex="0" placement="0" showAll="1">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field configurationFlags="None" name="id">
@@ -26218,29 +26237,29 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
-        <alias index="1" name="" field="label"/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="label" name=""/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="label"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="label" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="id" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="label" constraints="0"/>
+        <constraint exp_strength="0" field="id" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="label" notnull_strength="0" constraints="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" desc="" field="id"/>
-        <constraint exp="" desc="" field="label"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="label" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column width="-1" type="field" name="id" hidden="0"/>
-          <column width="-1" type="field" name="label" hidden="0"/>
+          <column width="-1" type="field" hidden="0" name="id"/>
+          <column width="-1" type="field" hidden="0" name="label"/>
           <column width="-1" type="actions" hidden="1"/>
         </columns>
       </attributetableconfig>
@@ -26273,12 +26292,12 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="id" editable="1"/>
-        <field name="label" editable="1"/>
+        <field editable="1" name="id"/>
+        <field editable="1" name="label"/>
       </editable>
       <labelOnTop>
-        <field name="id" labelOnTop="0"/>
-        <field name="label" labelOnTop="0"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="label"/>
       </labelOnTop>
       <reuseLastValue/>
       <dataDefinedFieldProperties/>
@@ -26286,18 +26305,18 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" simplifyLocal="1" autoRefreshTime="0" wkbType="MultiPolygon" simplifyDrawingHints="1" type="vector" symbologyReferenceScale="-1" minScale="100000000" legendPlaceholderImage="" refreshOnNotifyEnabled="0" labelsEnabled="1" maxScale="0" styleCategories="AllStyleCategories" simplifyAlgorithm="0" refreshOnNotifyMessage="" readOnly="0" geometry="Polygon" autoRefreshEnabled="0" simplifyDrawingTol="1">
+    <maplayer simplifyLocal="1" simplifyDrawingHints="1" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" simplifyMaxScale="1" legendPlaceholderImage="" symbologyReferenceScale="-1" readOnly="0" refreshOnNotifyEnabled="0" minScale="100000000" maxScale="0" type="vector" autoRefreshTime="0" simplifyAlgorithm="0" refreshOnNotifyMessage="" labelsEnabled="1" styleCategories="AllStyleCategories" geometry="Polygon" autoRefreshEnabled="0" wkbType="MultiPolygon">
       <extent>
         <xmin>18.37549461152003971</xmin>
         <ymin>-33.94162201868364548</ymin>
-        <xmax>18.41847731903260055</xmax>
-        <ymax>-33.90724620464386163</ymax>
+        <xmax>18.4196941505527505</xmax>
+        <ymax>-33.91635128720449188</ymax>
       </extent>
       <wgs84extent>
         <xmin>18.37549461152003971</xmin>
         <ymin>-33.94162201868364548</ymin>
-        <xmax>18.41847731903260055</xmax>
-        <ymax>-33.90724620464386163</ymax>
+        <xmax>18.4196941505527505</xmax>
+        <ymax>-33.91635128720449188</ymax>
       </wgs84extent>
       <id>water_tables20170921142016467</id>
       <datasource>./water_tables.shp</datasource>
@@ -26351,7 +26370,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial maxy="0" minz="0" dimensions="2" maxx="0" maxz="0" miny="0" minx="0" crs=""/>
+          <spatial maxz="0" minx="0" maxx="0" minz="0" crs="" miny="0" maxy="0" dimensions="2"/>
           <temporal>
             <period>
               <start></start>
@@ -26376,58 +26395,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" startExpression="" mode="0" limitMode="0" endField="" fixedDuration="0" accumulate="0" durationUnit="min" startField="" endExpression="" enabled="0">
+      <temporal durationField="" fixedDuration="0" accumulate="0" endField="" startField="" enabled="0" startExpression="" endExpression="" durationUnit="min" mode="0" limitMode="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation clamping="Terrain" zscale="1" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" binding="Centroid" type="IndividualFeatures" symbology="Line" extrusion="0" zoffset="0">
+      <elevation extrusionEnabled="0" symbology="Line" type="IndividualFeatures" zscale="1" clamping="Terrain" showMarkerSymbolInSurfacePlots="0" zoffset="0" extrusion="0" respectLayerSymbol="1" binding="Centroid">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="125,139,143,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.6" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="125,139,143,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.6" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -26458,36 +26477,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="125,139,143,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="89,99,102,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="125,139,143,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="89,99,102,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="125,139,143,255"/>
@@ -26502,44 +26521,44 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+            <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="angle"/>
-                <Option value="square" type="QString" name="cap_style"/>
-                <Option value="125,139,143,255" type="QString" name="color"/>
-                <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="diamond" type="QString" name="name"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="89,99,102,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.2" type="QString" name="outline_width"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="diameter" type="QString" name="scale_method"/>
-                <Option value="3" type="QString" name="size"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                <Option value="MM" type="QString" name="size_unit"/>
-                <Option value="1" type="QString" name="vertical_anchor_point"/>
+                <Option type="QString" value="0" name="angle"/>
+                <Option type="QString" value="square" name="cap_style"/>
+                <Option type="QString" value="125,139,143,255" name="color"/>
+                <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="diamond" name="name"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="89,99,102,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.2" name="outline_width"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="diameter" name="scale_method"/>
+                <Option type="QString" value="3" name="size"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                <Option type="QString" value="MM" name="size_unit"/>
+                <Option type="QString" value="1" name="vertical_anchor_point"/>
               </Option>
               <prop k="angle" v="0"/>
               <prop k="cap_style" v="square"/>
@@ -26562,46 +26581,104 @@ def my_form_open(dialog, layer, feature):
               <prop k="vertical_anchor_point" v="1"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" type="nullSymbol" symbollevels="0" referencescale="-1" enableorderby="0"/>
+      <renderer-v2 enableorderby="0" type="nullSymbol" symbollevels="0" referencescale="-1" forceraster="0"/>
       <labeling type="rule-based">
-        <rules key="{5dc8b36b-2058-4678-ad09-9a66ad011982}">
-          <rule filter="CASE&#xa;WHEN attribute( @atlas_feature , 'RouteLen' ) IS NULL THEN 1&#xa;WHEN regexp_match( &quot;races&quot;, attribute( @atlas_feature , 'RouteLen' ) ) THEN 1&#xa;ELSE 0&#xa;END" description="Show water tables" key="{6ef417ce-9c3a-42d0-a533-3a83b1a257ea}">
+        <rules key="{2bf934b8-ceac-4cd9-9cf0-74088d13e156}">
+          <rule description="Show water tables" key="{c438992b-4486-4e7d-a594-2c46fe177154}" filter="CASE&#xa;WHEN attribute( @atlas_feature , 'Source' ) IS NULL THEN 1&#xa;WHEN regexp_match( &quot;races&quot;, attribute( @atlas_feature , 'Source' ) ) THEN 1&#xa;ELSE 0&#xa;END">
             <settings calloutType="simple">
-              <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="75" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="31,120,180,255" textOpacity="0.90000000000000002" fieldName="label" useSubstitutions="0" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="8" namedStyle="Bold" forcedItalic="0" isExpression="0" fontSizeUnit="Point" allowHtml="0" legendString="Aa">
+              <text-style textOpacity="0.90000000000000002" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="Bold" fontUnderline="0" fieldName="label" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" useSubstitutions="0" fontWeight="75" fontStrikeout="0" fontItalic="0" fontSize="8" allowHtml="0" fontKerning="1" textColor="31,120,180,255" fontFamily="Myriad Pro" capitalization="0" isExpression="0" legendString="Aa" textOrientation="horizontal">
                 <families/>
-                <text-buffer bufferNoFill="0" bufferBlendMode="0" bufferSize="0.75" bufferJoinStyle="128" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="0.40000000000000002" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="0"/>
-                <background shapeRadiiY="0.5" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0.29999999999999999" shapeFillColor="255,255,255,204" shapeDraw="1" shapeBorderWidth="0.75" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0.75" shapeType="0" shapeJoinStyle="128" shapeOffsetUnit="MM" shapeBorderColor="31,120,206,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="0.59999999999999998" shapeOffsetY="-0.14999999999999999" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0.5" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-                  <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+                <text-buffer bufferNoFill="0" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="0.75" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="0.40000000000000002"/>
+                <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskType="0"/>
+                <background shapeRadiiY="0.5" shapeOffsetY="-0.14999999999999999" shapeSVGFile="" shapeRotation="0" shapeBorderColor="31,120,206,255" shapeRotationType="0" shapeSizeX="0.75" shapeDraw="1" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0.75" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,204" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="0.59999999999999998" shapeSizeY="0.29999999999999999" shapeRadiiX="0.5">
+                  <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="markerSymbol">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" type="QString" name="name"/>
+                        <Option type="QString" value="" name="name"/>
                         <Option name="properties"/>
-                        <Option value="collection" type="QString" name="type"/>
+                        <Option type="QString" value="collection" name="type"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                    <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
                       <Option type="Map">
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                        <Option value="255,255,255,204" type="QString" name="color"/>
-                        <Option value="round" type="QString" name="joinstyle"/>
-                        <Option value="0,0" type="QString" name="offset"/>
-                        <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                        <Option value="MM" type="QString" name="offset_unit"/>
-                        <Option value="31,120,206,255" type="QString" name="outline_color"/>
-                        <Option value="solid" type="QString" name="outline_style"/>
-                        <Option value="0.75" type="QString" name="outline_width"/>
-                        <Option value="MM" type="QString" name="outline_width_unit"/>
-                        <Option value="solid" type="QString" name="style"/>
+                        <Option type="QString" value="0" name="angle"/>
+                        <Option type="QString" value="square" name="cap_style"/>
+                        <Option type="QString" value="196,60,57,255" name="color"/>
+                        <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                        <Option type="QString" value="bevel" name="joinstyle"/>
+                        <Option type="QString" value="circle" name="name"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0" name="outline_width"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="diameter" name="scale_method"/>
+                        <Option type="QString" value="2" name="size"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="size_unit"/>
+                        <Option type="QString" value="1" name="vertical_anchor_point"/>
+                      </Option>
+                      <prop k="angle" v="0"/>
+                      <prop k="cap_style" v="square"/>
+                      <prop k="color" v="196,60,57,255"/>
+                      <prop k="horizontal_anchor_point" v="1"/>
+                      <prop k="joinstyle" v="bevel"/>
+                      <prop k="name" v="circle"/>
+                      <prop k="offset" v="0,0"/>
+                      <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="offset_unit" v="MM"/>
+                      <prop k="outline_color" v="35,35,35,255"/>
+                      <prop k="outline_style" v="solid"/>
+                      <prop k="outline_width" v="0"/>
+                      <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="outline_width_unit" v="MM"/>
+                      <prop k="scale_method" v="diameter"/>
+                      <prop k="size" v="2"/>
+                      <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                      <prop k="size_unit" v="MM"/>
+                      <prop k="vertical_anchor_point" v="1"/>
+                      <data_defined_properties>
+                        <Option type="Map">
+                          <Option type="QString" value="" name="name"/>
+                          <Option name="properties"/>
+                          <Option type="QString" value="collection" name="type"/>
+                        </Option>
+                      </data_defined_properties>
+                    </layer>
+                  </symbol>
+                  <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
+                    <data_defined_properties>
+                      <Option type="Map">
+                        <Option type="QString" value="" name="name"/>
+                        <Option name="properties"/>
+                        <Option type="QString" value="collection" name="type"/>
+                      </Option>
+                    </data_defined_properties>
+                    <layer locked="0" class="SimpleFill" enabled="1" pass="0">
+                      <Option type="Map">
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                        <Option type="QString" value="255,255,255,204" name="color"/>
+                        <Option type="QString" value="round" name="joinstyle"/>
+                        <Option type="QString" value="0,0" name="offset"/>
+                        <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                        <Option type="QString" value="MM" name="offset_unit"/>
+                        <Option type="QString" value="31,120,206,255" name="outline_color"/>
+                        <Option type="QString" value="solid" name="outline_style"/>
+                        <Option type="QString" value="0.75" name="outline_width"/>
+                        <Option type="QString" value="MM" name="outline_width_unit"/>
+                        <Option type="QString" value="solid" name="style"/>
                       </Option>
                       <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                       <prop k="color" v="255,255,255,204"/>
@@ -26616,56 +26693,56 @@ def my_form_open(dialog, layer, feature):
                       <prop k="style" v="solid"/>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" type="QString" name="name"/>
+                          <Option type="QString" value="" name="name"/>
                           <Option name="properties"/>
-                          <Option value="collection" type="QString" name="type"/>
+                          <Option type="QString" value="collection" name="type"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+                <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
                 <dd_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format useMaxLineLengthForAutoWrap="1" leftDirectionSymbol="&lt;" wrapChar="" multilineAlign="1" reverseDirectionSymbol="0" plussign="0" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" decimals="3" rightDirectionSymbol=">" formatNumbers="0"/>
-              <placement overlapHandling="PreventOverlap" lineAnchorType="0" centroidInside="0" overrunDistance="0" centroidWhole="1" geometryGeneratorEnabled="0" rotationAngle="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" polygonPlacementFlags="2" geometryGeneratorType="PointGeometry" quadOffset="1" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="0" xOffset="1" allowDegraded="0" lineAnchorTextPoint="CenterOfText" layerType="UnknownGeometry" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" maxCurvedCharAngleOut="-25" repeatDistance="0" offsetUnits="MapUnit" repeatDistanceUnits="MM" dist="0" distMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" distUnits="MM" lineAnchorClipping="0" placementFlags="10" priority="5" overrunDistanceUnit="MM" maxCurvedCharAngleIn="25" geometryGenerator="" lineAnchorPercent="0.5" yOffset="0" rotationUnit="AngleDegrees"/>
-              <rendering fontMaxPixelSize="10000" drawLabels="1" mergeLines="0" zIndex="5" upsidedownLabels="0" obstacleFactor="0.76000000000000001" scaleVisibility="0" limitNumLabels="0" obstacleType="0" fontLimitPixelSize="0" maxNumLabels="6" minFeatureSize="0" fontMinPixelSize="3" labelPerPart="0" obstacle="1" scaleMax="10000000" scaleMin="1" unplacedVisibility="0"/>
+              <text-format wrapChar="" rightDirectionSymbol=">" plussign="0" leftDirectionSymbol="&lt;" formatNumbers="0" decimals="3" multilineAlign="1" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" autoWrapLength="0" addDirectionSymbol="0" reverseDirectionSymbol="0"/>
+              <placement offsetUnits="MapUnit" xOffset="1" maxCurvedCharAngleOut="-25" layerType="PolygonGeometry" allowDegraded="0" yOffset="0" overlapHandling="PreventOverlap" geometryGeneratorType="PointGeometry" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" repeatDistanceUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25" quadOffset="1" lineAnchorClipping="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" rotationAngle="0" centroidWhole="1" overrunDistance="0" overrunDistanceUnit="MM" centroidInside="0" placement="0" geometryGenerator="" priority="5" distUnits="MM" lineAnchorType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" dist="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" lineAnchorTextPoint="CenterOfText" polygonPlacementFlags="2" rotationUnit="AngleDegrees" offsetType="0" placementFlags="10" repeatDistance="0"/>
+              <rendering limitNumLabels="0" obstacleType="0" obstacle="1" scaleMax="10000000" maxNumLabels="6" labelPerPart="0" scaleMin="1" upsidedownLabels="0" zIndex="5" unplacedVisibility="0" fontLimitPixelSize="0" minFeatureSize="0" fontMaxPixelSize="10000" scaleVisibility="0" fontMinPixelSize="3" drawLabels="1" mergeLines="0" obstacleFactor="0.76000000000000001"/>
               <dd_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </dd_properties>
               <callout type="simple">
                 <Option type="Map">
-                  <Option value="pole_of_inaccessibility" type="QString" name="anchorPoint"/>
-                  <Option value="0" type="int" name="blendMode"/>
+                  <Option type="QString" value="pole_of_inaccessibility" name="anchorPoint"/>
+                  <Option type="int" value="0" name="blendMode"/>
                   <Option type="Map" name="ddProperties">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
-                  <Option value="false" type="bool" name="drawToAllParts"/>
-                  <Option value="0" type="QString" name="enabled"/>
-                  <Option value="point_on_exterior" type="QString" name="labelAnchorPoint"/>
-                  <Option value="&lt;symbol is_animated=&quot;0&quot; type=&quot;line&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option value=&quot;square&quot; type=&quot;QString&quot; name=&quot;capstyle&quot;/>&lt;Option value=&quot;5;2&quot; type=&quot;QString&quot; name=&quot;customdash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;customdash_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option value=&quot;bevel&quot; type=&quot;QString&quot; name=&quot;joinstyle&quot;/>&lt;Option value=&quot;60,60,60,255&quot; type=&quot;QString&quot; name=&quot;line_color&quot;/>&lt;Option value=&quot;solid&quot; type=&quot;QString&quot; name=&quot;line_style&quot;/>&lt;Option value=&quot;0.3&quot; type=&quot;QString&quot; name=&quot;line_width&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;line_width_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;offset&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;offset_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;ring_filter&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option value=&quot;MM&quot; type=&quot;QString&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option value=&quot;0&quot; type=&quot;QString&quot; name=&quot;use_custom_dash&quot;/>&lt;Option value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option value=&quot;&quot; type=&quot;QString&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option value=&quot;collection&quot; type=&quot;QString&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString" name="lineSymbol"/>
-                  <Option value="0" type="double" name="minLength"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="minLengthMapUnitScale"/>
-                  <Option value="MM" type="QString" name="minLengthUnit"/>
-                  <Option value="0" type="double" name="offsetFromAnchor"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromAnchorMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromAnchorUnit"/>
-                  <Option value="0" type="double" name="offsetFromLabel"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offsetFromLabelMapUnitScale"/>
-                  <Option value="MM" type="QString" name="offsetFromLabelUnit"/>
+                  <Option type="bool" value="false" name="drawToAllParts"/>
+                  <Option type="QString" value="0" name="enabled"/>
+                  <Option type="QString" value="point_on_exterior" name="labelAnchorPoint"/>
+                  <Option type="QString" value="&lt;symbol alpha=&quot;1&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot; is_animated=&quot;0&quot; frame_rate=&quot;10&quot; name=&quot;symbol&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer locked=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;align_dash_pattern&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;square&quot; name=&quot;capstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;5;2&quot; name=&quot;customdash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;customdash_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;customdash_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;dash_pattern_offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;dash_pattern_offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;draw_inside_polygon&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;bevel&quot; name=&quot;joinstyle&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;60,60,60,255&quot; name=&quot;line_color&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;solid&quot; name=&quot;line_style&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0.3&quot; name=&quot;line_width&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;line_width_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;offset&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;offset_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;offset_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;ring_filter&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_end&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_end_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;trim_distance_start&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;MM&quot; name=&quot;trim_distance_start_unit&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;0&quot; name=&quot;use_custom_dash&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;3x:0,0,0,0,0,0&quot; name=&quot;width_map_unit_scale&quot;/>&lt;/Option>&lt;prop k=&quot;align_dash_pattern&quot; v=&quot;0&quot;/>&lt;prop k=&quot;capstyle&quot; v=&quot;square&quot;/>&lt;prop k=&quot;customdash&quot; v=&quot;5;2&quot;/>&lt;prop k=&quot;customdash_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;customdash_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;dash_pattern_offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;dash_pattern_offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;dash_pattern_offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;draw_inside_polygon&quot; v=&quot;0&quot;/>&lt;prop k=&quot;joinstyle&quot; v=&quot;bevel&quot;/>&lt;prop k=&quot;line_color&quot; v=&quot;60,60,60,255&quot;/>&lt;prop k=&quot;line_style&quot; v=&quot;solid&quot;/>&lt;prop k=&quot;line_width&quot; v=&quot;0.3&quot;/>&lt;prop k=&quot;line_width_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;offset&quot; v=&quot;0&quot;/>&lt;prop k=&quot;offset_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;offset_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;ring_filter&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_end_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_end_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;trim_distance_start&quot; v=&quot;0&quot;/>&lt;prop k=&quot;trim_distance_start_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;prop k=&quot;trim_distance_start_unit&quot; v=&quot;MM&quot;/>&lt;prop k=&quot;tweak_dash_pattern_on_corners&quot; v=&quot;0&quot;/>&lt;prop k=&quot;use_custom_dash&quot; v=&quot;0&quot;/>&lt;prop k=&quot;width_map_unit_scale&quot; v=&quot;3x:0,0,0,0,0,0&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option type=&quot;QString&quot; value=&quot;&quot; name=&quot;name&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option type=&quot;QString&quot; value=&quot;collection&quot; name=&quot;type&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" name="lineSymbol"/>
+                  <Option type="double" value="0" name="minLength"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="minLengthMapUnitScale"/>
+                  <Option type="QString" value="MM" name="minLengthUnit"/>
+                  <Option type="double" value="0" name="offsetFromAnchor"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromAnchorMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromAnchorUnit"/>
+                  <Option type="double" value="0" name="offsetFromLabel"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offsetFromLabelMapUnitScale"/>
+                  <Option type="QString" value="MM" name="offsetFromLabelUnit"/>
                 </Option>
               </callout>
             </settings>
@@ -26674,11 +26751,16 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" type="QString" name="QFieldSync/action"/>
-          <Option value="offline" type="QString" name="QFieldSync/cloud_action"/>
-          <Option value="{}" type="QString" name="QFieldSync/photo_naming"/>
-          <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString" name="dualview/previewExpressions"/>
-          <Option value="0" type="QString" name="embeddedWidgets/count"/>
+          <Option type="QString" value="copy" name="QFieldSync/action"/>
+          <Option type="QString" value="offline" name="QFieldSync/cloud_action"/>
+          <Option type="QString" value="{}" name="QFieldSync/photo_naming"/>
+          <Option type="List" name="dualview/previewExpressions">
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+            <Option type="QString" value="COALESCE( &quot;id&quot;, '&lt;NULL>' )"/>
+          </Option>
+          <Option type="QString" value="0" name="embeddedWidgets/count"/>
           <Option type="invalid" name="variableNames"/>
           <Option type="invalid" name="variableValues"/>
         </Option>
@@ -26686,48 +26768,48 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory penAlpha="255" width="15" sizeScale="3x:0,0,0,0,0,0" backgroundColor="#ffffff" minimumSize="0" enabled="0" maxScaleDenominator="1e+08" diagramOrientation="Up" opacity="1" scaleBasedVisibility="0" spacingUnit="MM" minScaleDenominator="0" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight" lineSizeType="MM" penWidth="0" backgroundAlpha="255" scaleDependency="Area" spacing="0" direction="1" barWidth="5" sizeType="MM" height="15" penColor="#000000" showAxis="0">
-          <fontProperties bold="0" style="" italic="0" description="Roboto Condensed,11,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0"/>
-          <attribute label="" colorOpacity="1" field="" color="#000000"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory height="15" scaleDependency="Area" width="15" lineSizeScale="3x:0,0,0,0,0,0" spacingUnit="MM" lineSizeType="MM" penColor="#000000" spacing="0" labelPlacementMethod="XHeight" spacingUnitScale="3x:0,0,0,0,0,0" diagramOrientation="Up" backgroundAlpha="255" maxScaleDenominator="1e+08" barWidth="5" penWidth="0" minimumSize="0" penAlpha="255" minScaleDenominator="0" sizeType="MM" backgroundColor="#ffffff" enabled="0" opacity="1" direction="1" scaleBasedVisibility="0" showAxis="0" sizeScale="3x:0,0,0,0,0,0" rotationOffset="270">
+          <fontProperties style="" description="Roboto Condensed,11,-1,5,50,0,0,0,0,0" strikethrough="0" italic="0" underline="0" bold="0"/>
+          <attribute color="#000000" field="" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="35,35,35,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0.26" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="35,35,35,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0.26" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -26758,9 +26840,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -26768,28 +26850,34 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="2" showAll="1" placement="0" zIndex="0" dist="0" priority="0" obstacle="0">
+      <DiagramLayerSettings priority="0" linePlacementFlags="2" obstacle="0" dist="0" zIndex="0" placement="0" showAll="1">
         <properties>
           <Option type="Map">
-            <Option value="" type="QString" name="name"/>
+            <Option type="QString" value="" name="name"/>
             <Option name="properties"/>
-            <Option value="collection" type="QString" name="type"/>
+            <Option type="QString" value="collection" name="type"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
-        <checkConfiguration/>
+        <checkConfiguration type="Map">
+          <Option type="Map" name="QgsGeometryGapCheck">
+            <Option type="double" value="0" name="allowedGapsBuffer"/>
+            <Option type="bool" value="false" name="allowedGapsEnabled"/>
+            <Option type="QString" value="" name="allowedGapsLayer"/>
+          </Option>
+        </checkConfiguration>
       </geometryOptions>
-      <legend showLabelLegend="0" type="default-vector"/>
+      <legend type="default-vector" showLabelLegend="0"/>
       <referencedLayers/>
       <fieldConfiguration>
         <field configurationFlags="None" name="id">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -26798,8 +26886,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -26808,8 +26896,8 @@ def my_form_open(dialog, layer, feature):
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" type="QString" name="IsMultiline"/>
-                <Option value="0" type="QString" name="UseHtml"/>
+                <Option type="QString" value="0" name="IsMultiline"/>
+                <Option type="QString" value="0" name="UseHtml"/>
               </Option>
             </config>
           </editWidget>
@@ -26821,42 +26909,54 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
+        <field configurationFlags="None" name="day">
+          <editWidget type="TextEdit">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
-        <alias index="1" name="" field="table_set"/>
-        <alias index="2" name="" field="label"/>
-        <alias index="3" name="" field="races"/>
+        <alias index="0" field="id" name=""/>
+        <alias index="1" field="table_set" name=""/>
+        <alias index="2" field="label" name=""/>
+        <alias index="3" field="races" name=""/>
+        <alias index="4" field="day" name=""/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="table_set"/>
-        <default applyOnUpdate="0" expression="" field="label"/>
-        <default applyOnUpdate="0" expression="" field="races"/>
+        <default applyOnUpdate="0" field="id" expression=""/>
+        <default applyOnUpdate="0" field="table_set" expression=""/>
+        <default applyOnUpdate="0" field="label" expression=""/>
+        <default applyOnUpdate="0" field="races" expression=""/>
+        <default applyOnUpdate="0" field="day" expression=""/>
       </defaults>
       <constraints>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="id" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="table_set" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="label" constraints="0"/>
-        <constraint unique_strength="0" exp_strength="0" notnull_strength="0" field="races" constraints="0"/>
+        <constraint exp_strength="0" field="id" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="table_set" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="label" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="races" notnull_strength="0" constraints="0" unique_strength="0"/>
+        <constraint exp_strength="0" field="day" notnull_strength="0" constraints="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint exp="" desc="" field="id"/>
-        <constraint exp="" desc="" field="table_set"/>
-        <constraint exp="" desc="" field="label"/>
-        <constraint exp="" desc="" field="races"/>
+        <constraint exp="" field="id" desc=""/>
+        <constraint exp="" field="table_set" desc=""/>
+        <constraint exp="" field="label" desc=""/>
+        <constraint exp="" field="races" desc=""/>
+        <constraint exp="" field="day" desc=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="&quot;table_set&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig sortExpression="&quot;table_set&quot;" sortOrder="0" actionWidgetStyle="dropDown">
         <columns>
-          <column width="-1" type="field" name="id" hidden="0"/>
+          <column width="-1" type="field" hidden="0" name="id"/>
           <column width="-1" type="actions" hidden="1"/>
-          <column width="-1" type="field" name="table_set" hidden="0"/>
-          <column width="-1" type="field" name="label" hidden="0"/>
-          <column width="130" type="field" name="races" hidden="0"/>
+          <column width="-1" type="field" hidden="0" name="table_set"/>
+          <column width="-1" type="field" hidden="0" name="label"/>
+          <column width="-1" type="field" hidden="0" name="day"/>
+          <column width="130" type="field" hidden="0" name="races"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -26888,18 +26988,26 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field name="id" editable="1"/>
-        <field name="label" editable="1"/>
-        <field name="races" editable="1"/>
-        <field name="table_set" editable="1"/>
+        <field editable="1" name="day"/>
+        <field editable="1" name="id"/>
+        <field editable="1" name="label"/>
+        <field editable="1" name="races"/>
+        <field editable="1" name="table_set"/>
       </editable>
       <labelOnTop>
-        <field name="id" labelOnTop="0"/>
-        <field name="label" labelOnTop="0"/>
-        <field name="races" labelOnTop="0"/>
-        <field name="table_set" labelOnTop="0"/>
+        <field labelOnTop="0" name="day"/>
+        <field labelOnTop="0" name="id"/>
+        <field labelOnTop="0" name="label"/>
+        <field labelOnTop="0" name="races"/>
+        <field labelOnTop="0" name="table_set"/>
       </labelOnTop>
-      <reuseLastValue/>
+      <reuseLastValue>
+        <field reuseLastValue="0" name="day"/>
+        <field reuseLastValue="0" name="id"/>
+        <field reuseLastValue="0" name="label"/>
+        <field reuseLastValue="0" name="races"/>
+        <field reuseLastValue="0" name="table_set"/>
+      </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
@@ -26931,7 +27039,7 @@ def my_form_open(dialog, layer, feature):
     <layer id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0"/>
     <layer id="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792"/>
     <layer id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea"/>
-    <layer id="route_markers_d58f7174_b6d0_4e1c_80ed_0d74635b8ca6"/>
+    <layer id="route_markers_4e92bf25_f500_4b5f_bf49_9dd0b475a0c9"/>
   </layerorder>
   <properties>
     <DefaultStyles/>
@@ -27100,7 +27208,7 @@ def my_form_open(dialog, layer, feature):
       <disabledLayers type="QStringList"/>
     </Identify>
     <Layouts>
-      <lastLayoutExportDir type="QString">/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/Routes</lastLayoutExportDir>
+      <lastLayoutExportDir type="QString">/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/Routes/Gun Run 2022 - Routes rev 3.1.pdf</lastLayoutExportDir>
     </Layouts>
     <Legend>
       <filterByMap type="bool">false</filterByMap>
@@ -27262,269 +27370,251 @@ def my_form_open(dialog, layer, feature):
   </properties>
   <dataDefinedServerProperties>
     <Option type="Map">
-      <Option value="" type="QString" name="name"/>
+      <Option type="QString" value="" name="name"/>
       <Option name="properties"/>
-      <Option value="collection" type="QString" name="type"/>
+      <Option type="QString" value="collection" name="type"/>
     </Option>
   </dataDefinedServerProperties>
   <visibility-presets>
     <visibility-preset has-expanded-info="1" name="Access Routes">
-      <layer style="default" visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer style="default" visible="1" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" expanded="1"/>
+      <layer id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" style="default" expanded="1" visible="1"/>
       <expanded-legend-nodes id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
-      <layer style="default" visible="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" expanded="0"/>
+      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default" expanded="0" visible="1"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" expanded="0" visible="1"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
       <expanded-group-nodes>
         <expanded-group-node id="Routes"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Map"/>
         <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Start and Finish pages"/>
+        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Elevation"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset has-expanded-info="1" name="Ask Me">
-      <layer style="default" visible="1" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" expanded="1"/>
+      <layer id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" style="default" expanded="1" visible="1"/>
       <expanded-legend-nodes id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
-      <layer style="default" visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer style="default" visible="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" expanded="1"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer style="default" visible="1" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" expanded="1"/>
+      <layer id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" style="default" expanded="1" visible="1"/>
       <expanded-legend-nodes id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
-      <layer style="default" visible="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" expanded="1"/>
+      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" expanded="1" visible="1"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default" expanded="1" visible="1"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" expanded="0" visible="1"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
       <expanded-group-nodes>
         <expanded-group-node id="Routes"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="Map"/>
+        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Ask Me"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Feeding Stations"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset has-expanded-info="1" name="Fencing">
-      <layer style="default" visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer style="default" visible="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" expanded="1"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer style="default" visible="1" id="water_tables20170921142016467" expanded="1"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer style="default" visible="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" expanded="1"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer style="Fencing" visible="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" expanded="1"/>
-      <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
-        <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
-        <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
-        <checked-legend-node id="{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 style="default" visible="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" expanded="1"/>
+      <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default" expanded="1" visible="1"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{ca3590cd-5839-41e2-824b-eca47a2b7a14}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default" expanded="1" visible="1"/>
+      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" expanded="1" visible="1"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer id="water_tables20170921142016467" style="default" expanded="1" visible="1"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="Fencing" expanded="1" visible="1"/>
+      <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
+        <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+        <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
+        <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
+        <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
+        <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+      </expanded-legend-nodes>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" expanded="0" visible="1"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Routes"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="Map"/>
+        <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Feeding Stations"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset has-expanded-info="1" name="Marshal map - inset">
-      <layer style="default" visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer style="default" visible="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" expanded="1"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer style="default" visible="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" expanded="1"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer style="default" visible="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" expanded="1"/>
+      <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default" expanded="1" visible="1"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" expanded="1" visible="1"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default" expanded="1" visible="1"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" expanded="0" visible="1"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Routes"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="Map"/>
+        <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Feeding Stations"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset has-expanded-info="1" name="Marshal map - main">
-      <layer style="default" visible="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" expanded="1"/>
+      <layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default" expanded="1" visible="1"/>
       <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer style="default" visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer style="default" visible="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" expanded="1"/>
+      <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default" expanded="1" visible="1"/>
+      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
+        <checked-legend-node id="{82ba5c12-5eaf-4bf1-af1a-89035ce48b3a}"/>
+        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
+        <checked-legend-node id="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default" expanded="1" visible="1"/>
       <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer style="default" visible="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" expanded="1"/>
+      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" expanded="1" visible="1"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer style="Fencing" visible="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" expanded="1"/>
+      <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="Fencing" expanded="1" visible="1"/>
       <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
+        <checked-legend-node id="{9da1c54c-0ca9-4db9-a722-ce3f53ccd358}"/>
         <checked-legend-node id="{b3b38ee9-c245-4839-b078-3b966a2a5c4e}"/>
         <checked-legend-node id="{bb4463e8-e33a-4475-878c-fd2d7b636418}"/>
-        <checked-legend-node id="{9da1c54c-0ca9-4db9-a722-ce3f53ccd358}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
-      <layer style="default" visible="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" expanded="1"/>
-      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
-        <checked-legend-node id="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}"/>
-        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
-        <checked-legend-node id="{82ba5c12-5eaf-4bf1-af1a-89035ce48b3a}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" expanded="0" visible="1"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
       <expanded-group-nodes>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Map"/>
         <expanded-group-node id="Fencing and Cones"/>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Feeding Stations"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset has-expanded-info="1" has-checked-group-info="1" name="Marshal overview">
-      <layer style="default" visible="0" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" expanded="1"/>
-      <expanded-legend-nodes id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea"/>
-      <layer style="default" visible="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" expanded="1"/>
+    <visibility-preset has-checked-group-info="1" has-expanded-info="1" name="Marshal overview">
+      <layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default" expanded="1" visible="1"/>
       <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
         <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer style="default" visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer style="default" visible="0" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" expanded="1"/>
+      <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default" expanded="1" visible="1"/>
+      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
+        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <layer id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" style="default" expanded="1" visible="0"/>
       <expanded-legend-nodes id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0"/>
-      <layer style="default" visible="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" expanded="0"/>
+      <layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default" expanded="0" visible="1"/>
       <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer style="default" visible="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" expanded="1"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer style="default" visible="0" id="water_tables20170921142016467" expanded="1"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer style="default" visible="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" expanded="1"/>
+      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" expanded="1" visible="1"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer style="Fencing" visible="0" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" expanded="1"/>
+      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default" expanded="1" visible="1"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer id="water_tables20170921142016467" style="default" expanded="1" visible="0"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="Fencing" expanded="1" visible="0"/>
       <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
-        <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
-        <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
-        <checked-legend-node id="{29865286-9e35-459b-929c-beb87e7538de}"/>
         <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
         <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
+        <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
+        <checked-legend-node id="{29865286-9e35-459b-929c-beb87e7538de}"/>
+        <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
       </expanded-legend-nodes>
-      <layer style="default" visible="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" expanded="1"/>
-      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
-        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <layer id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" style="default" expanded="1" visible="0"/>
+      <expanded-legend-nodes id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" expanded="0" visible="1"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
       <checked-group-nodes>
         <checked-group-node id="Routes"/>
-        <checked-group-node id="OSM data"/>
-        <checked-group-node id="Marshals"/>
-        <checked-group-node id="Routes/Markers"/>
         <checked-group-node id="Map"/>
+        <checked-group-node id="Marshals"/>
+        <checked-group-node id="OSM data"/>
+        <checked-group-node id="Routes/Markers"/>
       </checked-group-nodes>
       <expanded-group-nodes>
         <expanded-group-node id="Routes"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="Map"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Feeding Stations"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset has-expanded-info="1" has-checked-group-info="1" name="Routes">
-      <layer style="default" visible="0" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" expanded="1"/>
-      <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
-        <checked-legend-node id="{308d81eb-cefa-4627-8afb-3baa8363f863}"/>
-        <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer style="Fencing" visible="0" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" expanded="1"/>
-      <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
-        <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
-        <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
-        <checked-legend-node id="{29865286-9e35-459b-929c-beb87e7538de}"/>
-        <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 style="default" visible="1" id="route_markers_d58f7174_b6d0_4e1c_80ed_0d74635b8ca6" expanded="1"/>
-      <expanded-legend-nodes id="route_markers_d58f7174_b6d0_4e1c_80ed_0d74635b8ca6"/>
-      <layer style="default" visible="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" expanded="1"/>
+    <visibility-preset has-checked-group-info="1" has-expanded-info="1" name="Routes">
+      <layer id="route_markers_4e92bf25_f500_4b5f_bf49_9dd0b475a0c9" style="default" expanded="1" visible="1"/>
+      <expanded-legend-nodes id="route_markers_4e92bf25_f500_4b5f_bf49_9dd0b475a0c9"/>
+      <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default" expanded="1" visible="1"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer style="default" visible="0" id="water_tables20170921142016467" expanded="1"/>
+      <layer id="water_tables20170921142016467" style="default" expanded="1" visible="1"/>
       <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer style="default" visible="0" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" expanded="1"/>
-      <expanded-legend-nodes id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0"/>
-      <layer style="default" visible="0" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" expanded="1"/>
-      <expanded-legend-nodes id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea"/>
-      <layer style="default" visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" expanded="0" visible="1"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer style="default" visible="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" expanded="1"/>
+      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" expanded="1" visible="1"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer style="default" visible="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" expanded="1"/>
+      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default" expanded="1" visible="1"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <checked-group-nodes>
         <checked-group-node id="Routes"/>
+        <checked-group-node id="Map"/>
         <checked-group-node id="OSM data"/>
         <checked-group-node id="Routes/Markers"/>
-        <checked-group-node id="Map"/>
+        <checked-group-node id="Feeding Stations"/>
       </checked-group-nodes>
       <expanded-group-nodes>
         <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="Map"/>
+        <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Start and Finish pages"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Feeding Stations"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset has-expanded-info="1" name="Start/Finish">
-      <layer style="default" visible="1" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" expanded="1"/>
-      <expanded-legend-nodes id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
-      <layer style="default" visible="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" expanded="1"/>
+      <layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default" expanded="1" visible="1"/>
       <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer style="default" visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" expanded="0"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer style="default" visible="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" expanded="1"/>
+      <layer id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" style="default" expanded="1" visible="1"/>
+      <expanded-legend-nodes id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
+      <layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default" expanded="1" visible="1"/>
       <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer style="default" visible="1" id="water_tables20170921142016467" expanded="1"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer style="default" visible="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" expanded="1"/>
+      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" expanded="1" visible="1"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer style="Fencing" visible="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" expanded="1"/>
+      <layer id="water_tables20170921142016467" style="default" expanded="1" visible="1"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="Fencing" expanded="1" visible="1"/>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" expanded="0" visible="1"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Routes"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Marshal pages"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Start and Finish pages"/>
+        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Marshal pages"/>
       </expanded-group-nodes>
     </visibility-preset>
   </visibility-presets>
@@ -27551,31 +27641,31 @@ def my_form_open(dialog, layer, feature):
   </projectMetadata>
   <Annotations/>
   <Layouts>
-    <Layout name="Marshals" printResolution="120" worldFileMap="" units="mm">
-      <Snapper snapToItems="1" snapToGuides="1" tolerance="5" snapToGrid="0"/>
-      <Grid resUnits="mm" offsetUnits="mm" offsetY="0" offsetX="0" resolution="10"/>
+    <Layout units="mm" printResolution="120" worldFileMap="" name="Marshals">
+      <Snapper snapToGuides="1" tolerance="5" snapToGrid="0" snapToItems="1"/>
+      <Grid resolution="10" offsetY="0" offsetX="0" offsetUnits="mm" resUnits="mm"/>
       <PageCollection>
-        <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+        <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="255,255,255,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="no" type="QString" name="outline_style"/>
-              <Option value="0.26" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+              <Option type="QString" value="255,255,255,255" name="color"/>
+              <Option type="QString" value="miter" name="joinstyle"/>
+              <Option type="QString" value="0,0" name="offset"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+              <Option type="QString" value="MM" name="offset_unit"/>
+              <Option type="QString" value="0,0,0,255" name="outline_color"/>
+              <Option type="QString" value="no" name="outline_style"/>
+              <Option type="QString" value="0.26" name="outline_width"/>
+              <Option type="QString" value="MM" name="outline_width_unit"/>
+              <Option type="QString" value="solid" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
@@ -27590,49 +27680,49 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem outlineWidthM="0.3,mm" groupUuid="" position="0,0,mm" positionLock="false" templateUuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" uuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" type="65638" blendMode="0" size="297,210,mm" opacity="1" visibility="1" referencePoint="0" id="" frame="false" zValue="0" frameJoinStyle="miter" positionOnPage="0,0,mm" background="true" excludeFromExports="0" itemRotation="0">
-          <FrameColor red="0" green="0" blue="0" alpha="255"/>
-          <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+        <LayoutItem referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" groupUuid="" positionOnPage="0,0,mm" positionLock="false" frameJoinStyle="miter" frame="false" type="65638" outlineWidthM="0.3,mm" templateUuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" background="true" size="297,210,mm" zValue="0" uuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" opacity="1" position="0,0,mm" excludeFromExports="0">
+          <FrameColor alpha="255" red="0" blue="0" green="0"/>
+          <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="255,255,255,255" type="QString" name="color"/>
-                <Option value="miter" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="255,255,255,255" name="color"/>
+                <Option type="QString" value="miter" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                <Option type="QString" value="no" name="outline_style"/>
+                <Option type="QString" value="0.26" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -27647,9 +27737,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -27657,15 +27747,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem rasterBorderWidth="0" outlineWidthM="0.1,mm" maxSymbolSize="0" rasterBorderColor="0,0,0,255" frameJoinStyle="bevel" excludeFromExports="0" title="" columnCount="1" background="true" rasterBorder="1" boxSpace="2" size="39.4312,46.1,mm" map_uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" legendFilterByAtlas="0" wmsLegendHeight="25" columnSpace="2" type="65642" symbolAlignment="1" id="" positionLock="true" blendMode="0" positionOnPage="110.353,5.04491,mm" splitLayer="0" resizeToContents="1" templateUuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" frame="true" opacity="1" uuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" minSymbolSize="0" fontColor="#000000" lineSpacing="1" referencePoint="0" visibility="1" wrapChar="" itemRotation="0" symbolWidth="7" wmsLegendWidth="50" groupUuid="" position="110.353,5.04491,mm" symbolHeight="4" equalColumnWidth="1" titleAlignment="1" zValue="5">
-        <FrameColor red="128" green="128" blue="128" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem splitLayer="0" size="39.4312,46.1,mm" legendFilterByAtlas="0" boxSpace="2" templateUuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" blendMode="0" maxSymbolSize="0" position="110.353,5.04491,mm" groupUuid="" wrapChar="" minSymbolSize="0" referencePoint="0" symbolAlignment="1" itemRotation="0" title="" equalColumnWidth="1" resizeToContents="1" wmsLegendHeight="25" columnCount="1" outlineWidthM="0.1,mm" rasterBorder="1" background="true" visibility="1" symbolHeight="4" fontColor="#000000" positionLock="true" zValue="5" titleAlignment="1" lineSpacing="1" columnSpace="2" id="" rasterBorderColor="0,0,0,255" positionOnPage="110.353,5.04491,mm" excludeFromExports="0" rasterBorderWidth="0" type="65642" wmsLegendWidth="50" uuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" opacity="1" frame="true" symbolWidth="7" map_uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" frameJoinStyle="bevel">
+        <FrameColor alpha="255" red="128" blue="128" green="128"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -27673,48 +27763,48 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style name="title" indent="0" alignment="1">
-            <styleFont bold="0" style="Regular" italic="0" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" underline="0" strikethrough="0"/>
+          <style indent="0" alignment="1" name="title">
+            <styleFont style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" strikethrough="0" italic="0" underline="0" bold="0"/>
           </style>
-          <style name="group" indent="0" alignment="1">
-            <styleFont bold="1" style="Semibold" italic="0" description="Myriad Pro,11,-1,5,75,0,0,0,0,0,Semibold" underline="0" strikethrough="0"/>
+          <style indent="0" alignment="1" name="group">
+            <styleFont style="Semibold" description="Myriad Pro,11,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0" italic="0" underline="0" bold="1"/>
           </style>
-          <style name="subgroup" indent="0" alignment="1" marginTop="1">
-            <styleFont bold="1" style="Semibold" italic="0" description="Myriad Pro,9,-1,5,75,0,0,0,0,0,Semibold" underline="0" strikethrough="0"/>
+          <style marginTop="1" indent="0" alignment="1" name="subgroup">
+            <styleFont style="Semibold" description="Myriad Pro,9,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0" italic="0" underline="0" bold="1"/>
           </style>
-          <style name="symbol" indent="0" alignment="1" marginTop="2">
-            <styleFont bold="0" style="" italic="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0"/>
+          <style marginTop="2" indent="0" alignment="1" name="symbol">
+            <styleFont style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0" strikethrough="0" italic="0" underline="0" bold="0"/>
           </style>
-          <style marginLeft="2" name="symbolLabel" indent="0" alignment="1" marginTop="2">
-            <styleFont bold="1" style="Semibold" italic="0" description="Myriad Pro,8,-1,5,75,0,0,0,0,0,Semibold" underline="0" strikethrough="0"/>
+          <style marginTop="2" marginLeft="2" indent="0" alignment="1" name="symbolLabel">
+            <styleFont style="Semibold" description="Myriad Pro,8,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0" italic="0" underline="0" bold="1"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group checked="Qt::Checked" name="Routes" groupLayer="" expanded="1">
+          <layer-tree-group expanded="1" groupLayer="" checked="Qt::Checked" name="Routes">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer checked="Qt::Checked" legend_exp="" source="./all_routes.shp|layername=all_routes" name="all_routes" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" providerKey="ogr" legend_split_behavior="0" patch_size="0,0" expanded="1">
+            <layer-tree-layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" expanded="1" legend_split_behavior="0" source="./all_routes.shp|layername=all_routes" legend_exp="" providerKey="ogr" patch_size="0,0" checked="Qt::Checked" name="all_routes">
               <customproperties>
                 <Option type="Map">
-                  <Option value="1,2,3" type="QString" name="legend/node-order"/>
-                  <Option value="hidden" type="QString" name="legend/title-style"/>
+                  <Option type="QString" value="1,2,3" name="legend/node-order"/>
+                  <Option type="QString" value="hidden" name="legend/title-style"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
-          <layer-tree-group checked="Qt::Unchecked" name="Fencing and Cones" groupLayer="" expanded="1">
+          <layer-tree-group expanded="1" groupLayer="" checked="Qt::Unchecked" name="Fencing and Cones">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer checked="Qt::Checked" legend_exp="" source="./fencing.shp|layername=fencing" name="fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" providerKey="ogr" legend_split_behavior="0" patch_size="0,0" expanded="1">
+            <layer-tree-layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" expanded="1" legend_split_behavior="0" source="./fencing.shp|layername=fencing" legend_exp="" providerKey="ogr" patch_size="0,0" checked="Qt::Checked" name="fencing">
               <customproperties>
                 <Option type="Map">
-                  <Option value="0,1,2" type="QString" name="legend/node-order"/>
-                  <Option value="hidden" type="QString" name="legend/title-style"/>
+                  <Option type="QString" value="0,1,2" name="legend/node-order"/>
+                  <Option type="QString" value="hidden" name="legend/title-style"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -27722,62 +27812,62 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.2,mm" groupUuid="" position="98.7828,149.027,mm" positionLock="true" templateUuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" uuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" type="65639" blendMode="0" followPresetName="Marshal map - inset" keepLayerSet="false" size="56.5192,54.5647,mm" opacity="1" visibility="1" referencePoint="0" id="" frame="true" followPreset="true" zValue="4" frameJoinStyle="miter" labelMargin="0,mm" positionOnPage="98.7828,149.027,mm" mapRotation="0" background="true" excludeFromExports="0" itemRotation="0" drawCanvasItems="false" mapFlags="0" isTemporal="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" drawCanvasItems="false" mapRotation="0" mapFlags="0" groupUuid="" positionOnPage="98.7828,149.027,mm" positionLock="true" frameJoinStyle="miter" followPresetName="Marshal map - inset" frame="true" type="65639" outlineWidthM="0.2,mm" labelMargin="0,mm" templateUuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" background="true" size="56.5192,54.5647,mm" zValue="4" uuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" opacity="1" position="98.7828,149.027,mm" keepLayerSet="false" excludeFromExports="0" isTemporal="0" followPreset="true">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.41064302246786966" ymax="-33.89902512102636223" ymin="-33.90316824413850583" xmax="18.41493455420295433"/>
+        <Extent ymax="-33.89902512102636223" xmin="18.41064302246786966" ymin="-33.90316824413850583" xmax="18.41493455420295433"/>
         <LayerSet/>
-        <ComposerMapGrid show="0" rotatedTicksEnabled="0" gridFrameStyle="0" crossLength="3" gridFrameMargin="0" leftFrameDivisions="0" bottomFrameDivisions="0" gridFramePenThickness="0.5" topAnnotationDisplay="0" topAnnotationPosition="1" rotatedTicksMinimumAngle="0" name="Grid 1" showAnnotation="0" rotatedAnnotationsEnabled="0" rotatedTicksLengthMode="0" annotationExpression="" intervalX="0" bottomAnnotationPosition="1" rightAnnotationDisplay="0" rotatedAnnotationsMinimumAngle="0" annotationPrecision="3" frameFillColor1="255,255,255,255" blendMode="0" offsetY="0" gridFrameWidth="2" leftAnnotationDisplay="0" uuid="{3ef84102-ed03-4cdc-8cad-41bf1801eda2}" rotatedAnnotationsMarginToCorner="0" topFrameDivisions="0" topAnnotationDirection="0" rightAnnotationPosition="1" rotatedTicksMarginToCorner="0" gridStyle="0" minimumIntervalWidth="50" intervalY="0" unit="0" maximumIntervalWidth="100" gridFrameSideFlags="15" frameAnnotationDistance="1" frameFillColor2="0,0,0,255" rightAnnotationDirection="0" position="3" bottomAnnotationDisplay="0" leftAnnotationPosition="1" rotatedAnnotationsLengthMode="0" annotationFormat="0" gridFramePenColor="0,0,0,255" leftAnnotationDirection="0" rightFrameDivisions="0" bottomAnnotationDirection="0" offsetX="0">
+        <ComposerMapGrid bottomAnnotationPosition="1" frameFillColor2="0,0,0,255" blendMode="0" bottomAnnotationDisplay="0" name="Grid 1" frameFillColor1="255,255,255,255" position="3" bottomFrameDivisions="0" topAnnotationPosition="1" crossLength="3" leftAnnotationDisplay="0" intervalY="0" rotatedAnnotationsMarginToCorner="0" gridFrameStyle="0" annotationFormat="0" topAnnotationDirection="0" leftFrameDivisions="0" topFrameDivisions="0" annotationPrecision="3" rotatedTicksMinimumAngle="0" rightFrameDivisions="0" maximumIntervalWidth="100" unit="0" rotatedTicksEnabled="0" topAnnotationDisplay="0" leftAnnotationPosition="1" show="0" rotatedTicksMarginToCorner="0" rotatedTicksLengthMode="0" gridStyle="0" rotatedAnnotationsMinimumAngle="0" minimumIntervalWidth="50" bottomAnnotationDirection="0" annotationExpression="" intervalX="0" offsetY="0" offsetX="0" gridFramePenColor="0,0,0,255" gridFrameMargin="0" gridFrameWidth="2" rightAnnotationDisplay="0" rotatedAnnotationsEnabled="0" leftAnnotationDirection="0" rightAnnotationDirection="0" gridFrameSideFlags="15" gridFramePenThickness="0.5" showAnnotation="0" uuid="{3ef84102-ed03-4cdc-8cad-41bf1801eda2}" rightAnnotationPosition="1" frameAnnotationDistance="1" rotatedAnnotationsLengthMode="0">
           <lineStyle>
-            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0,0,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0,0,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -27808,44 +27898,44 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+              <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="angle"/>
-                  <Option value="square" type="QString" name="cap_style"/>
-                  <Option value="0,0,0,255" type="QString" name="color"/>
-                  <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="circle" type="QString" name="name"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                  <Option value="solid" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="diameter" type="QString" name="scale_method"/>
-                  <Option value="2" type="QString" name="size"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="size_unit"/>
-                  <Option value="1" type="QString" name="vertical_anchor_point"/>
+                  <Option type="QString" value="0" name="angle"/>
+                  <Option type="QString" value="square" name="cap_style"/>
+                  <Option type="QString" value="0,0,0,255" name="color"/>
+                  <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="circle" name="name"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                  <Option type="QString" value="solid" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="diameter" name="scale_method"/>
+                  <Option type="QString" value="2" name="size"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="size_unit"/>
+                  <Option type="QString" value="1" name="vertical_anchor_point"/>
                 </Option>
                 <prop k="angle" v="0"/>
                 <prop k="cap_style" v="square"/>
@@ -27868,40 +27958,40 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="50" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="1" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="10" namedStyle="" forcedItalic="0" fontSizeUnit="Point" allowHtml="0">
+          <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="" fontUnderline="0" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" fontWeight="50" fontStrikeout="0" fontItalic="0" fontSize="10" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" textOrientation="horizontal">
             <families/>
-            <text-buffer bufferNoFill="1" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="1.5"/>
-            <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeBorderWidth="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-              <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <text-buffer bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+            <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskType="0"/>
+            <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
+              <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                    <Option value="255,255,255,255" type="QString" name="color"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                    <Option value="no" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="solid" type="QString" name="style"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                    <Option type="QString" value="255,255,255,255" name="color"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                    <Option type="QString" value="no" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="solid" name="style"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -27916,29 +28006,29 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+            <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -27946,28 +28036,28 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <ComposerMapOverview inverted="0" centered="1" uuid="{00880e74-3a34-4c80-a062-9e7dfc538d75}" show="1" frameMap="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" position="3" blendMode="0" name="Overview 1">
-          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+        <ComposerMapOverview blendMode="0" inverted="0" frameMap="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" centered="1" position="3" uuid="{00880e74-3a34-4c80-a062-9e7dfc538d75}" show="1" name="Overview 1">
+          <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="0,65,170,127" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,102" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="0,65,170,127" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="35,35,35,102" name="outline_color"/>
+                <Option type="QString" value="no" name="outline_style"/>
+                <Option type="QString" value="0.26" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="0,65,170,127"/>
@@ -27982,9 +28072,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -27992,9 +28082,9 @@ def my_form_open(dialog, layer, feature):
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -28002,69 +28092,69 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapOverview>
-        <AtlasMap margin="0.10000000000000001" atlasDriven="1" scalingMode="0"/>
+        <AtlasMap margin="0.10000000000000001" scalingMode="0" atlasDriven="1"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" enabled="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clipSource="" enabled="0" clippingType="0"/>
+        <itemClippingSettings clipSource="" forceLabelsInside="0" clippingType="0" enabled="0"/>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" groupUuid="" position="3.53,6.0007,mm" positionLock="true" templateUuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" type="65639" blendMode="0" followPresetName="Marshal map - main" keepLayerSet="false" size="142,187.018,mm" opacity="1" visibility="1" referencePoint="0" id="" frame="false" followPreset="true" zValue="3" frameJoinStyle="miter" labelMargin="0,mm" positionOnPage="3.53,6.0007,mm" mapRotation="0" background="false" excludeFromExports="0" itemRotation="0" drawCanvasItems="false" mapFlags="0" isTemporal="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" drawCanvasItems="false" mapRotation="0" mapFlags="0" groupUuid="" positionOnPage="3.53,6.0007,mm" positionLock="true" frameJoinStyle="miter" followPresetName="Marshal map - main" frame="false" type="65639" outlineWidthM="0.3,mm" labelMargin="0,mm" templateUuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" background="false" size="142,187.018,mm" zValue="3" uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" opacity="1" position="3.53,6.0007,mm" keepLayerSet="false" excludeFromExports="0" isTemporal="0" followPreset="true">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.41227535330844844" ymax="-33.90042047455022356" ymin="-33.9017728906146445" xmax="18.41330222336237554"/>
+        <Extent ymax="-33.90042047455022356" xmin="18.41227535330844844" ymin="-33.9017728906146445" xmax="18.41330222336237554"/>
         <LayerSet/>
-        <ComposerMapGrid show="0" rotatedTicksEnabled="0" gridFrameStyle="0" crossLength="3" gridFrameMargin="0" leftFrameDivisions="0" bottomFrameDivisions="0" gridFramePenThickness="0.5" topAnnotationDisplay="0" topAnnotationPosition="1" rotatedTicksMinimumAngle="0" name="Grid 1" showAnnotation="0" rotatedAnnotationsEnabled="0" rotatedTicksLengthMode="0" annotationExpression="" intervalX="0" bottomAnnotationPosition="1" rightAnnotationDisplay="0" rotatedAnnotationsMinimumAngle="0" annotationPrecision="3" frameFillColor1="255,255,255,255" blendMode="0" offsetY="0" gridFrameWidth="2" leftAnnotationDisplay="0" uuid="{c6f52ccd-dffd-428e-8bbf-f3d65e856d30}" rotatedAnnotationsMarginToCorner="0" topFrameDivisions="0" topAnnotationDirection="0" rightAnnotationPosition="1" rotatedTicksMarginToCorner="0" gridStyle="0" minimumIntervalWidth="50" intervalY="0" unit="0" maximumIntervalWidth="100" gridFrameSideFlags="15" frameAnnotationDistance="1" frameFillColor2="0,0,0,255" rightAnnotationDirection="0" position="3" bottomAnnotationDisplay="0" leftAnnotationPosition="1" rotatedAnnotationsLengthMode="0" annotationFormat="0" gridFramePenColor="0,0,0,255" leftAnnotationDirection="0" rightFrameDivisions="0" bottomAnnotationDirection="0" offsetX="0">
+        <ComposerMapGrid bottomAnnotationPosition="1" frameFillColor2="0,0,0,255" blendMode="0" bottomAnnotationDisplay="0" name="Grid 1" frameFillColor1="255,255,255,255" position="3" bottomFrameDivisions="0" topAnnotationPosition="1" crossLength="3" leftAnnotationDisplay="0" intervalY="0" rotatedAnnotationsMarginToCorner="0" gridFrameStyle="0" annotationFormat="0" topAnnotationDirection="0" leftFrameDivisions="0" topFrameDivisions="0" annotationPrecision="3" rotatedTicksMinimumAngle="0" rightFrameDivisions="0" maximumIntervalWidth="100" unit="0" rotatedTicksEnabled="0" topAnnotationDisplay="0" leftAnnotationPosition="1" show="0" rotatedTicksMarginToCorner="0" rotatedTicksLengthMode="0" gridStyle="0" rotatedAnnotationsMinimumAngle="0" minimumIntervalWidth="50" bottomAnnotationDirection="0" annotationExpression="" intervalX="0" offsetY="0" offsetX="0" gridFramePenColor="0,0,0,255" gridFrameMargin="0" gridFrameWidth="2" rightAnnotationDisplay="0" rotatedAnnotationsEnabled="0" leftAnnotationDirection="0" rightAnnotationDirection="0" gridFrameSideFlags="15" gridFramePenThickness="0.5" showAnnotation="0" uuid="{c6f52ccd-dffd-428e-8bbf-f3d65e856d30}" rightAnnotationPosition="1" frameAnnotationDistance="1" rotatedAnnotationsLengthMode="0">
           <lineStyle>
-            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0,0,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0,0,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -28095,44 +28185,44 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+              <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="angle"/>
-                  <Option value="square" type="QString" name="cap_style"/>
-                  <Option value="0,0,0,255" type="QString" name="color"/>
-                  <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="circle" type="QString" name="name"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                  <Option value="solid" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="diameter" type="QString" name="scale_method"/>
-                  <Option value="2" type="QString" name="size"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="size_unit"/>
-                  <Option value="1" type="QString" name="vertical_anchor_point"/>
+                  <Option type="QString" value="0" name="angle"/>
+                  <Option type="QString" value="square" name="cap_style"/>
+                  <Option type="QString" value="0,0,0,255" name="color"/>
+                  <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="circle" name="name"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                  <Option type="QString" value="solid" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="diameter" name="scale_method"/>
+                  <Option type="QString" value="2" name="size"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="size_unit"/>
+                  <Option type="QString" value="1" name="vertical_anchor_point"/>
                 </Option>
                 <prop k="angle" v="0"/>
                 <prop k="cap_style" v="square"/>
@@ -28155,40 +28245,40 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="50" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="1" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="10" namedStyle="" forcedItalic="0" fontSizeUnit="Point" allowHtml="0">
+          <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="" fontUnderline="0" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" fontWeight="50" fontStrikeout="0" fontItalic="0" fontSize="10" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" textOrientation="horizontal">
             <families/>
-            <text-buffer bufferNoFill="1" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="1.5"/>
-            <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeBorderWidth="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-              <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <text-buffer bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+            <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskType="0"/>
+            <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
+              <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                    <Option value="255,255,255,255" type="QString" name="color"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                    <Option value="no" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="solid" type="QString" name="style"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                    <Option type="QString" value="255,255,255,255" name="color"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                    <Option type="QString" value="no" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="solid" name="style"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -28203,29 +28293,29 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+            <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -28233,22 +28323,22 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap margin="0.10000000000000001" atlasDriven="1" scalingMode="0"/>
+        <AtlasMap margin="0.10000000000000001" scalingMode="0" atlasDriven="1"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" enabled="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clipSource="" enabled="0" clippingType="0"/>
+        <itemClippingSettings clipSource="" forceLabelsInside="0" clippingType="0" enabled="0"/>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" groupUuid="" position="290.617,6.0007,mm" hidePageIfEmpty="0" positionLock="true" templateUuid="{29f4a843-0516-4360-b00e-581dbc907eda}" uuid="{29f4a843-0516-4360-b00e-581dbc907eda}" multiFrame="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" type="65647" blendMode="0" size="142.117,187.018,mm" opacity="1" sectionWidth="142.117" visibility="1" referencePoint="2" hideBackgroundIfEmpty="0" id="" frame="false" zValue="2" frameJoinStyle="round" sectionHeight="182.4" multiFrameTemplateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" positionOnPage="290.617,6.0007,mm" sectionY="0" sectionX="0" background="false" excludeFromExports="0" itemRotation="0">
-        <FrameColor red="119" green="119" blue="119" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem referencePoint="2" blendMode="0" sectionWidth="142.117" itemRotation="0" id="" visibility="1" groupUuid="" positionOnPage="290.617,6.0007,mm" positionLock="true" frameJoinStyle="round" sectionHeight="182.4" frame="false" type="65647" outlineWidthM="0.3,mm" templateUuid="{29f4a843-0516-4360-b00e-581dbc907eda}" background="false" sectionY="0" size="142.117,187.018,mm" zValue="2" uuid="{29f4a843-0516-4360-b00e-581dbc907eda}" opacity="1" hideBackgroundIfEmpty="0" position="290.617,6.0007,mm" sectionX="0" excludeFromExports="0" multiFrameTemplateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" multiFrame="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" hidePageIfEmpty="0">
+        <FrameColor alpha="255" red="119" blue="119" green="119"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -28256,21 +28346,21 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" groupUuid="" position="246.665,178.41,mm" anchorPoint="0" positionLock="true" svgFillColor="255,255,255,255" templateUuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" uuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" type="65640" blendMode="0" size="47.1065,27.6,mm" opacity="1" visibility="1" svgBorderColor="0,0,0,255" northMode="0" northOffset="0" referencePoint="0" id="" frame="false" zValue="1" mode="1" frameJoinStyle="miter" resizeMode="0" positionOnPage="246.665,178.41,mm" file="../Gun_Run_Logo.png" svgBorderWidth="0.2" pictureRotation="0" background="false" pictureHeight="27.6" pictureWidth="27.4317" excludeFromExports="0" itemRotation="0" mapUuid="">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" mapUuid="" svgBorderWidth="0.2" pictureHeight="27.6" groupUuid="" positionOnPage="246.665,178.41,mm" positionLock="true" frameJoinStyle="miter" mode="1" frame="false" type="65640" outlineWidthM="0.3,mm" resizeMode="0" file="../Gun_Run_Logo.png" northOffset="0" templateUuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" background="false" svgFillColor="255,255,255,255" pictureRotation="0" size="47.1065,27.6,mm" zValue="1" uuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" svgBorderColor="0,0,0,255" northMode="0" opacity="1" position="246.665,178.41,mm" excludeFromExports="0" pictureWidth="27.4317" anchorPoint="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedSource">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -28278,14 +28368,14 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutMultiFrame html="&lt;table>&#xa;&lt;tr>&lt;td width=&quot;45%&quot;>Position&lt;/td>&lt;td width=&quot;55%&quot;>&lt;b>[%&quot;position&quot;%]&lt;/b>&lt;/td>&lt;/tr>&#xa;[%if ( &quot;csv_club&quot; = 'AAC', '&lt;tr>&lt;td>Name&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_club&quot; = 'AAC', &quot;csv_name&quot;, '')%]&#xa;[%if ( &quot;csv_club&quot; = 'AAC', '&lt;/td>&lt;/tr>', '')%]&#xa;&lt;tr>&lt;td>Club&lt;/td>&lt;td>[%csv_club%]&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Captain&lt;/td>&lt;td>[%csv_captain%]&lt;/td>&lt;/tr>&#xa;&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;tr>&lt;td>Last Runner&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, &quot;csv_last_runner&quot;, '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;/td>&lt;tr>', '')%]&#xa;&#xa;&lt;tr>&lt;td colspan=2>&lt;b>Contact Numbers&lt;b>&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>VOC&lt;/td>&lt;td width=&quot;120&quot;>&lt;b>021 430 7374&amp;nbsp;&amp;nbsp;(emergencies)&lt;/b>&lt;/td>&lt;/tr>&#xa;&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', '&lt;tr>&lt;td>')%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', &quot;csv_captain&quot;)%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', '&amp;nbsp;&lt;/td>&lt;td>')%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', &quot;csv_captain_phone&quot;)%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', '&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;/table>&#xa;&#xa;&lt;p>&lt;b>[% &quot;csv_instructions&quot; %]&lt;/b>&lt;/p>&#xa;&#xa;&lt;p>Please return your bib and flag to the information desk at the finish (accessible from Vlei Road or Stephen Way).&lt;/p>&#xa;&lt;p style=&quot;text-align: right&quot;>Thank you!&lt;/p>" stylesheet="td, p {&#xa;&#x9;font-family: &quot;Myriad Pro&quot;, sans-serif;&#xa;&#x9;font-size: 5pt;&#xa;}&#xa;p {&#xa;&#x9;text-align: justify;&#xa;}&#xa;b{&#xa;&#x9;font-weight: 600;&#xa;}" stylesheetEnabled="true" uuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" templateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" resizeMode="0" url="" evaluateExpressions="true" useSmartBreaks="true" maxBreakDistance="12" type="65648" contentMode="1">
-        <childFrame uuid="{29f4a843-0516-4360-b00e-581dbc907eda}" templateUuid="{29f4a843-0516-4360-b00e-581dbc907eda}"/>
+      <LayoutMultiFrame useSmartBreaks="true" type="65648" templateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" stylesheetEnabled="true" resizeMode="0" uuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" 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;[%if ( &quot;csv_club&quot; = 'AAC', '&lt;tr>&lt;td>Name&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_club&quot; = 'AAC', &quot;csv_name&quot;, '')%]&#xa;[%if ( &quot;csv_club&quot; = 'AAC', '&lt;/td>&lt;/tr>', '')%]&#xa;&lt;tr>&lt;td>Club&lt;/td>&lt;td>[%csv_club%]&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Captain&lt;/td>&lt;td>[%csv_captain%]&lt;/td>&lt;/tr>&#xa;&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;tr>&lt;td>Last Runner&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, &quot;csv_last_runner&quot;, '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;/td>&lt;tr>', '')%]&#xa;&#xa;&lt;tr>&lt;td colspan=2>&lt;b>Contact Numbers&lt;b>&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>VOC&lt;/td>&lt;td width=&quot;120&quot;>&lt;b>021 430 7374&amp;nbsp;&amp;nbsp;(emergencies)&lt;/b>&lt;/td>&lt;/tr>&#xa;&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', '&lt;tr>&lt;td>')%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', &quot;csv_captain&quot;)%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', '&amp;nbsp;&lt;/td>&lt;td>')%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', &quot;csv_captain_phone&quot;)%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', '&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;/table>&#xa;&#xa;&lt;p>&lt;b>[% &quot;csv_instructions&quot; %]&lt;/b>&lt;/p>&#xa;&#xa;&lt;p>Please return your bib and flag to the information desk at the finish (accessible from Vlei Road or Stephen Way).&lt;/p>&#xa;&lt;p style=&quot;text-align: right&quot;>Thank you!&lt;/p>" 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;}" url="" maxBreakDistance="12" contentMode="1">
+        <childFrame templateUuid="{29f4a843-0516-4360-b00e-581dbc907eda}" uuid="{29f4a843-0516-4360-b00e-581dbc907eda}"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -28295,53 +28385,53 @@ def my_form_open(dialog, layer, feature):
       </LayoutMultiFrame>
       <customproperties>
         <Option type="Map">
-          <Option value="jpg" type="QString" name="atlasRasterFormat"/>
-          <Option value="0" type="QString" name="forceVector"/>
-          <Option value="true" type="QString" name="imageAntialias"/>
-          <Option value="0" type="QString" name="imageCropMarginBottom"/>
-          <Option value="0" type="QString" name="imageCropMarginLeft"/>
-          <Option value="0" type="QString" name="imageCropMarginRight"/>
-          <Option value="0" type="QString" name="imageCropMarginTop"/>
-          <Option value="0" type="QString" name="imageCropMarginUnit"/>
-          <Option value="false" type="QString" name="imageCropToContents"/>
-          <Option value="0" type="QString" name="pdfDisableRasterTiles"/>
-          <Option value="1" type="QString" name="pdfIncludeMetadata"/>
-          <Option value="0" type="QString" name="pdfTextFormat"/>
-          <Option value="false" type="QString" name="rasterize"/>
-          <Option value="3.53" type="QString" name="resizeToContentsBottomMargin"/>
-          <Option value="3.53" type="QString" name="resizeToContentsLeftMargin"/>
-          <Option value="3.53" type="QString" name="resizeToContentsRightMargin"/>
-          <Option value="3.53" type="QString" name="resizeToContentsTopMargin"/>
-          <Option value="false" type="QString" name="singleFile"/>
+          <Option type="QString" value="jpg" name="atlasRasterFormat"/>
+          <Option type="QString" value="0" name="forceVector"/>
+          <Option type="QString" value="true" name="imageAntialias"/>
+          <Option type="QString" value="0" name="imageCropMarginBottom"/>
+          <Option type="QString" value="0" name="imageCropMarginLeft"/>
+          <Option type="QString" value="0" name="imageCropMarginRight"/>
+          <Option type="QString" value="0" name="imageCropMarginTop"/>
+          <Option type="QString" value="0" name="imageCropMarginUnit"/>
+          <Option type="QString" value="false" name="imageCropToContents"/>
+          <Option type="QString" value="0" name="pdfDisableRasterTiles"/>
+          <Option type="QString" value="1" name="pdfIncludeMetadata"/>
+          <Option type="QString" value="0" name="pdfTextFormat"/>
+          <Option type="QString" value="false" name="rasterize"/>
+          <Option type="QString" value="3.53" name="resizeToContentsBottomMargin"/>
+          <Option type="QString" value="3.53" name="resizeToContentsLeftMargin"/>
+          <Option type="QString" value="3.53" name="resizeToContentsRightMargin"/>
+          <Option type="QString" value="3.53" name="resizeToContentsTopMargin"/>
+          <Option type="QString" value="false" name="singleFile"/>
         </Option>
       </customproperties>
-      <Atlas hideCoverage="0" pageNameExpression="&quot;position&quot;" sortFeatures="1" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/marshal_positions.shp|layername=marshal_positions" filenamePattern="&quot;csv_club&quot;||'_marshal_map_'||&quot;position&quot;" coverageLayerName="marshal_positions" sortAscending="1" filterFeatures="0" coverageLayer="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" sortKey="position" coverageLayerProvider="ogr" enabled="1"/>
+      <Atlas sortKey="position" sortAscending="1" filenamePattern="&quot;csv_club&quot;||'_marshal_map_'||&quot;position&quot;" coverageLayer="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" filterFeatures="0" hideCoverage="0" enabled="1" coverageLayerProvider="ogr" pageNameExpression="&quot;position&quot;" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/marshal_positions.shp|layername=marshal_positions" coverageLayerName="marshal_positions" sortFeatures="1"/>
     </Layout>
-    <Layout name="Start &amp; Finish Backgrounds" printResolution="300" worldFileMap="" units="mm">
-      <Snapper snapToItems="1" snapToGuides="1" tolerance="5" snapToGrid="0"/>
-      <Grid resUnits="mm" offsetUnits="mm" offsetY="0" offsetX="0" resolution="10"/>
+    <Layout units="mm" printResolution="300" worldFileMap="" name="Start &amp; Finish Backgrounds">
+      <Snapper snapToGuides="1" tolerance="5" snapToGrid="0" snapToItems="1"/>
+      <Grid resolution="10" offsetY="0" offsetX="0" offsetUnits="mm" resUnits="mm"/>
       <PageCollection>
-        <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+        <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="255,255,255,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="no" type="QString" name="outline_style"/>
-              <Option value="0.26" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+              <Option type="QString" value="255,255,255,255" name="color"/>
+              <Option type="QString" value="miter" name="joinstyle"/>
+              <Option type="QString" value="0,0" name="offset"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+              <Option type="QString" value="MM" name="offset_unit"/>
+              <Option type="QString" value="0,0,0,255" name="outline_color"/>
+              <Option type="QString" value="no" name="outline_style"/>
+              <Option type="QString" value="0.26" name="outline_width"/>
+              <Option type="QString" value="MM" name="outline_width_unit"/>
+              <Option type="QString" value="solid" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
@@ -28356,49 +28446,49 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem outlineWidthM="0.3,mm" groupUuid="" position="0,0,mm" positionLock="false" templateUuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" uuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" type="65638" blendMode="0" size="297,210,mm" opacity="1" visibility="1" referencePoint="0" id="" frame="false" zValue="0" frameJoinStyle="miter" positionOnPage="0,0,mm" background="true" excludeFromExports="0" itemRotation="0">
-          <FrameColor red="0" green="0" blue="0" alpha="255"/>
-          <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+        <LayoutItem referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" groupUuid="" positionOnPage="0,0,mm" positionLock="false" frameJoinStyle="miter" frame="false" type="65638" outlineWidthM="0.3,mm" templateUuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" background="true" size="297,210,mm" zValue="0" uuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" opacity="1" position="0,0,mm" excludeFromExports="0">
+          <FrameColor alpha="255" red="0" blue="0" green="0"/>
+          <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="255,255,255,255" type="QString" name="color"/>
-                <Option value="miter" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="255,255,255,255" name="color"/>
+                <Option type="QString" value="miter" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                <Option type="QString" value="no" name="outline_style"/>
+                <Option type="QString" value="0.26" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -28413,9 +28503,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -28423,21 +28513,21 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem outlineWidthM="0.3,mm" groupUuid="" position="286.027,2,mm" anchorPoint="0" positionLock="true" svgFillColor="255,255,255,255" templateUuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" uuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" type="65640" blendMode="0" size="9.45865,11,mm" opacity="1" visibility="1" svgBorderColor="0,0,0,255" northMode="0" northOffset="0" referencePoint="0" id="" frame="false" zValue="4" mode="0" frameJoinStyle="miter" resizeMode="0" positionOnPage="286.027,2,mm" file="arrows/NorthArrow_11.svg" svgBorderWidth="0.2" pictureRotation="330" background="false" pictureHeight="7.97477" pictureWidth="6.31767" excludeFromExports="0" itemRotation="0" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" svgBorderWidth="0.2" pictureHeight="7.97477" groupUuid="" positionOnPage="286.027,2,mm" positionLock="true" frameJoinStyle="miter" mode="0" frame="false" type="65640" outlineWidthM="0.3,mm" resizeMode="0" file="arrows/NorthArrow_11.svg" northOffset="0" templateUuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" background="false" svgFillColor="255,255,255,255" pictureRotation="330" size="9.45865,11,mm" zValue="4" uuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" svgBorderColor="0,0,0,255" northMode="0" opacity="1" position="286.027,2,mm" excludeFromExports="0" pictureWidth="6.31767" anchorPoint="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedSource">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -28445,47 +28535,47 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" valign="64" groupUuid="" position="285.027,205.886,mm" positionLock="true" templateUuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" uuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" type="65641" blendMode="0" size="142.543,10.3185,mm" opacity="1" visibility="1" htmlState="0" referencePoint="0" marginX="1" id="" halign="1" frame="false" zValue="3" labelText="[%upper( &quot;area&quot; )%]" frameJoinStyle="miter" positionOnPage="285.027,205.886,mm" background="false" marginY="1" excludeFromExports="0" itemRotation="270">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem marginY="1" referencePoint="0" blendMode="0" itemRotation="270" id="" visibility="1" htmlState="0" groupUuid="" positionOnPage="285.027,205.886,mm" positionLock="true" frameJoinStyle="miter" frame="false" type="65641" outlineWidthM="0.3,mm" templateUuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" background="false" size="142.543,10.3185,mm" labelText="[%upper( &quot;area&quot; )%]" zValue="3" uuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" opacity="1" position="285.027,205.886,mm" marginX="1" halign="1" valign="64" excludeFromExports="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="50" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="1" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="12" namedStyle="" forcedItalic="0" fontSizeUnit="Point" allowHtml="0">
+        <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="" fontUnderline="0" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" fontWeight="50" fontStrikeout="0" fontItalic="0" fontSize="12" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferNoFill="1" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="1.5"/>
-          <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeBorderWidth="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <text-buffer bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
+            <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -28500,65 +28590,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem lineJoinStyle="miter" outlineWidthM="0.3,mm" numUnitsPerSegment="100" frameJoinStyle="miter" excludeFromExports="0" height="3" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" background="false" unitLabel="m" maxBarWidth="150" lineCapStyle="square" size="145.54,16.2165,mm" numSegments="4" outlineWidth="0.3" type="65646" boxContentSpace="1" id="" labelVerticalPlacement="0" positionLock="true" blendMode="0" positionOnPage="7,189.669,mm" templateUuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" frame="false" numMapUnitsPerScaleBarUnit="1" opacity="1" uuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" labelHorizontalPlacement="0" style="Single Box" referencePoint="0" visibility="1" labelBarSpace="3" itemRotation="0" segmentMillimeters="26.3519" segmentSizeMode="1" minBarWidth="50" numSegmentsLeft="2" numSubdivisions="1" groupUuid="" position="7,189.669,mm" unitType="meters" subdivisionsHeight="1.5" alignment="0" zValue="2">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" alignment="0" size="145.54,16.2165,mm" unitLabel="m" templateUuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" blendMode="0" labelBarSpace="3" position="7,189.669,mm" groupUuid="" referencePoint="0" unitType="meters" lineCapStyle="square" itemRotation="0" maxBarWidth="150" numMapUnitsPerScaleBarUnit="1" subdivisionsHeight="1.5" outlineWidthM="0.3,mm" labelHorizontalPlacement="0" outlineWidth="0.3" background="false" numSubdivisions="1" visibility="1" numSegments="4" segmentSizeMode="1" numUnitsPerSegment="100" lineJoinStyle="miter" positionLock="true" zValue="2" id="" labelVerticalPlacement="0" positionOnPage="7,189.669,mm" excludeFromExports="0" style="Single Box" segmentMillimeters="26.3519" type="65646" minBarWidth="50" uuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" opacity="1" boxContentSpace="1" frame="false" frameJoinStyle="miter" numSegmentsLeft="2" height="3">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="50" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="1" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="12" namedStyle="" forcedItalic="0" fontSizeUnit="Point" allowHtml="0">
+        <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="" fontUnderline="0" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" fontWeight="50" fontStrikeout="0" fontItalic="0" fontSize="12" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferNoFill="1" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="0"/>
-          <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeBorderWidth="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <text-buffer bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
+            <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -28573,75 +28663,75 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
-        <strokeColor red="0" green="0" blue="0" alpha="255"/>
+        <strokeColor alpha="255" red="0" blue="0" green="0"/>
         <numericFormat id="basic">
           <Option type="Map">
-            <Option value="" type="QChar" name="decimal_separator"/>
-            <Option value="6" type="int" name="decimals"/>
-            <Option value="0" type="int" name="rounding_type"/>
-            <Option value="false" type="bool" name="show_plus"/>
-            <Option value="true" type="bool" name="show_thousand_separator"/>
-            <Option value="false" type="bool" name="show_trailing_zeros"/>
-            <Option value="" type="QChar" name="thousand_separator"/>
+            <Option type="QChar" value="" name="decimal_separator"/>
+            <Option type="int" value="6" name="decimals"/>
+            <Option type="int" value="0" name="rounding_type"/>
+            <Option type="bool" value="false" name="show_plus"/>
+            <Option type="bool" value="true" name="show_thousand_separator"/>
+            <Option type="bool" value="false" name="show_trailing_zeros"/>
+            <Option type="QChar" value="" name="thousand_separator"/>
           </Option>
         </numericFormat>
-        <fillColor red="0" green="0" blue="0" alpha="255"/>
-        <fillColor2 red="255" green="255" blue="255" alpha="255"/>
+        <fillColor alpha="255" red="0" blue="0" green="0"/>
+        <fillColor2 alpha="255" red="255" blue="255" green="255"/>
         <lineSymbol>
-          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="miter" type="QString" name="joinstyle"/>
-                <Option value="0,0,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.3" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="miter" name="joinstyle"/>
+                <Option type="QString" value="0,0,0,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.3" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -28672,52 +28762,52 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </lineSymbol>
         <divisionLineSymbol>
-          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="miter" type="QString" name="joinstyle"/>
-                <Option value="0,0,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.3" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="miter" name="joinstyle"/>
+                <Option type="QString" value="0,0,0,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.3" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -28748,52 +28838,52 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </divisionLineSymbol>
         <subdivisionLineSymbol>
-          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="miter" type="QString" name="joinstyle"/>
-                <Option value="0,0,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.3" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="miter" name="joinstyle"/>
+                <Option type="QString" value="0,0,0,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.3" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -28824,36 +28914,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </subdivisionLineSymbol>
         <fillSymbol1>
-          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="0,0,0,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="0,0,0,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                <Option type="QString" value="no" name="outline_style"/>
+                <Option type="QString" value="0.26" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="0,0,0,255"/>
@@ -28868,36 +28958,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol1>
         <fillSymbol2>
-          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="255,255,255,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="255,255,255,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                <Option type="QString" value="no" name="outline_style"/>
+                <Option type="QString" value="0.26" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -28912,87 +29002,87 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol2>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" groupUuid="" position="7,5.5,mm" positionLock="true" templateUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" uuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" type="65639" blendMode="0" followPresetName="Start/Finish" keepLayerSet="false" size="278.027,180.318,mm" opacity="1" visibility="1" referencePoint="0" id="" frame="false" followPreset="true" zValue="1" frameJoinStyle="miter" labelMargin="0,mm" positionOnPage="7,5.5,mm" mapRotation="330" background="false" excludeFromExports="0" itemRotation="0" drawCanvasItems="false" mapFlags="0" isTemporal="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" drawCanvasItems="false" mapRotation="330" mapFlags="0" groupUuid="" positionOnPage="7,5.5,mm" positionLock="true" frameJoinStyle="miter" followPresetName="Start/Finish" frame="false" type="65639" outlineWidthM="0.3,mm" labelMargin="0,mm" templateUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" background="false" size="278.027,180.318,mm" zValue="1" uuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" opacity="1" position="7,5.5,mm" keepLayerSet="false" excludeFromExports="0" isTemporal="0" followPreset="true">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedMapRotation">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="rotation" type="QString" name="field"/>
-                  <Option value="2" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="rotation" name="field"/>
+                  <Option type="int" value="2" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapScale">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="id" type="QString" name="field"/>
-                  <Option value="2" type="int" name="type"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="id" name="field"/>
+                  <Option type="int" value="2" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedRotation">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="angle" type="QString" name="field"/>
-                  <Option value="2" type="int" name="type"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="angle" name="field"/>
+                  <Option type="int" value="2" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.40843143571575169" ymax="-33.89880140828828559" ymin="-33.90494830469008747" xmax="18.41790915398017958"/>
+        <Extent ymax="-33.89880140828828559" xmin="18.40843143571575169" ymin="-33.90494830469008747" xmax="18.41790915398017958"/>
         <LayerSet/>
-        <ComposerMapGrid show="0" rotatedTicksEnabled="0" gridFrameStyle="0" crossLength="3" gridFrameMargin="0" leftFrameDivisions="0" bottomFrameDivisions="0" gridFramePenThickness="0.5" topAnnotationDisplay="3" topAnnotationPosition="1" rotatedTicksMinimumAngle="0" name="Grid 1" showAnnotation="0" rotatedAnnotationsEnabled="0" rotatedTicksLengthMode="0" annotationExpression="" intervalX="5" bottomAnnotationPosition="1" rightAnnotationDisplay="3" rotatedAnnotationsMinimumAngle="0" annotationPrecision="3" frameFillColor1="255,255,255,255" blendMode="0" offsetY="0" gridFrameWidth="2" leftAnnotationDisplay="3" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" rotatedAnnotationsMarginToCorner="0" topFrameDivisions="0" topAnnotationDirection="0" rightAnnotationPosition="1" rotatedTicksMarginToCorner="0" gridStyle="0" minimumIntervalWidth="50" intervalY="5" unit="1" maximumIntervalWidth="100" gridFrameSideFlags="15" frameAnnotationDistance="1" frameFillColor2="0,0,0,255" rightAnnotationDirection="0" position="3" bottomAnnotationDisplay="3" leftAnnotationPosition="1" rotatedAnnotationsLengthMode="0" annotationFormat="4" gridFramePenColor="0,0,0,255" leftAnnotationDirection="0" rightFrameDivisions="0" bottomAnnotationDirection="0" offsetX="0">
+        <ComposerMapGrid bottomAnnotationPosition="1" frameFillColor2="0,0,0,255" blendMode="0" bottomAnnotationDisplay="3" name="Grid 1" frameFillColor1="255,255,255,255" position="3" bottomFrameDivisions="0" topAnnotationPosition="1" crossLength="3" leftAnnotationDisplay="3" intervalY="5" rotatedAnnotationsMarginToCorner="0" gridFrameStyle="0" annotationFormat="4" topAnnotationDirection="0" leftFrameDivisions="0" topFrameDivisions="0" annotationPrecision="3" rotatedTicksMinimumAngle="0" rightFrameDivisions="0" maximumIntervalWidth="100" unit="1" rotatedTicksEnabled="0" topAnnotationDisplay="3" leftAnnotationPosition="1" show="0" rotatedTicksMarginToCorner="0" rotatedTicksLengthMode="0" gridStyle="0" rotatedAnnotationsMinimumAngle="0" minimumIntervalWidth="50" bottomAnnotationDirection="0" annotationExpression="" intervalX="5" offsetY="0" offsetX="0" gridFramePenColor="0,0,0,255" gridFrameMargin="0" gridFrameWidth="2" rightAnnotationDisplay="3" rotatedAnnotationsEnabled="0" leftAnnotationDirection="0" rightAnnotationDirection="0" gridFrameSideFlags="15" gridFramePenThickness="0.5" showAnnotation="0" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" rightAnnotationPosition="1" frameAnnotationDistance="1" rotatedAnnotationsLengthMode="0">
           <lineStyle>
-            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="195,195,195,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="195,195,195,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -29023,44 +29113,44 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+              <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="angle"/>
-                  <Option value="square" type="QString" name="cap_style"/>
-                  <Option value="0,0,0,255" type="QString" name="color"/>
-                  <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="circle" type="QString" name="name"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                  <Option value="solid" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="diameter" type="QString" name="scale_method"/>
-                  <Option value="2" type="QString" name="size"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="size_unit"/>
-                  <Option value="1" type="QString" name="vertical_anchor_point"/>
+                  <Option type="QString" value="0" name="angle"/>
+                  <Option type="QString" value="square" name="cap_style"/>
+                  <Option type="QString" value="0,0,0,255" name="color"/>
+                  <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="circle" name="name"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                  <Option type="QString" value="solid" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="diameter" name="scale_method"/>
+                  <Option type="QString" value="2" name="size"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="size_unit"/>
+                  <Option type="QString" value="1" name="vertical_anchor_point"/>
                 </Option>
                 <prop k="angle" v="0"/>
                 <prop k="cap_style" v="square"/>
@@ -29083,9 +29173,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -29102,32 +29192,32 @@ def my_form_open(dialog, layer, feature):
             <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
             <geographicflag>false</geographicflag>
           </spatialrefsys>
-          <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="50" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="1" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="10" namedStyle="" forcedItalic="0" fontSizeUnit="Point" allowHtml="0">
+          <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="" fontUnderline="0" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" fontWeight="50" fontStrikeout="0" fontItalic="0" fontSize="10" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" textOrientation="horizontal">
             <families/>
-            <text-buffer bufferNoFill="1" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="1.5"/>
-            <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeBorderWidth="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-              <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <text-buffer bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+            <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskType="0"/>
+            <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
+              <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                    <Option value="255,255,255,255" type="QString" name="color"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                    <Option value="no" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="solid" type="QString" name="style"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                    <Option type="QString" value="255,255,255,255" name="color"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                    <Option type="QString" value="no" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="solid" name="style"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -29142,29 +29232,29 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+            <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -29172,65 +29262,65 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap margin="0.05" atlasDriven="1" scalingMode="2"/>
+        <AtlasMap margin="0.05" scalingMode="2" atlasDriven="1"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" enabled="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clipSource="" enabled="0" clippingType="0"/>
+        <itemClippingSettings clipSource="" forceLabelsInside="0" clippingType="0" enabled="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" type="QString" name="atlasRasterFormat"/>
-          <Option value="0" type="QString" name="forceVector"/>
-          <Option value="true" type="QString" name="imageAntialias"/>
-          <Option value="0" type="QString" name="imageCropMarginBottom"/>
-          <Option value="0" type="QString" name="imageCropMarginLeft"/>
-          <Option value="0" type="QString" name="imageCropMarginRight"/>
-          <Option value="0" type="QString" name="imageCropMarginTop"/>
-          <Option value="false" type="QString" name="imageCropToContents"/>
-          <Option value="0" type="QString" name="pdfDisableRasterTiles"/>
-          <Option value="1" type="QString" name="pdfIncludeMetadata"/>
-          <Option value="0" type="QString" name="pdfTextFormat"/>
-          <Option value="true" type="QString" name="singleFile"/>
-          <Option value="0" type="QString" name="svgCropMarginBottom"/>
-          <Option value="0" type="QString" name="svgCropMarginLeft"/>
-          <Option value="0" type="QString" name="svgCropMarginRight"/>
-          <Option value="0" type="QString" name="svgCropMarginTop"/>
-          <Option value="true" type="QString" name="svgCropToContents"/>
-          <Option value="0" type="QString" name="svgDisableRasterTiles"/>
-          <Option value="false" type="QString" name="svgGroupLayers"/>
-          <Option value="1" type="QString" name="svgIncludeMetadata"/>
-          <Option value="0" type="QString" name="svgTextFormat"/>
+          <Option type="QString" value="png" name="atlasRasterFormat"/>
+          <Option type="QString" value="0" name="forceVector"/>
+          <Option type="QString" value="true" name="imageAntialias"/>
+          <Option type="QString" value="0" name="imageCropMarginBottom"/>
+          <Option type="QString" value="0" name="imageCropMarginLeft"/>
+          <Option type="QString" value="0" name="imageCropMarginRight"/>
+          <Option type="QString" value="0" name="imageCropMarginTop"/>
+          <Option type="QString" value="false" name="imageCropToContents"/>
+          <Option type="QString" value="0" name="pdfDisableRasterTiles"/>
+          <Option type="QString" value="1" name="pdfIncludeMetadata"/>
+          <Option type="QString" value="0" name="pdfTextFormat"/>
+          <Option type="QString" value="true" name="singleFile"/>
+          <Option type="QString" value="0" name="svgCropMarginBottom"/>
+          <Option type="QString" value="0" name="svgCropMarginLeft"/>
+          <Option type="QString" value="0" name="svgCropMarginRight"/>
+          <Option type="QString" value="0" name="svgCropMarginTop"/>
+          <Option type="QString" value="true" name="svgCropToContents"/>
+          <Option type="QString" value="0" name="svgDisableRasterTiles"/>
+          <Option type="QString" value="false" name="svgGroupLayers"/>
+          <Option type="QString" value="1" name="svgIncludeMetadata"/>
+          <Option type="QString" value="0" name="svgTextFormat"/>
         </Option>
       </customproperties>
-      <Atlas hideCoverage="1" pageNameExpression="&quot;area&quot;" sortFeatures="1" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/start_finish_area.shp" filenamePattern="'output_'||@atlas_featurenumber" coverageLayerName="start_finish_area" sortAscending="1" filterFeatures="0" coverageLayer="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" sortKey="area" coverageLayerProvider="ogr" enabled="1"/>
+      <Atlas sortKey="area" sortAscending="1" filenamePattern="'output_'||@atlas_featurenumber" coverageLayer="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" filterFeatures="0" hideCoverage="1" enabled="1" coverageLayerProvider="ogr" pageNameExpression="&quot;area&quot;" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/start_finish_area.shp" coverageLayerName="start_finish_area" sortFeatures="1"/>
     </Layout>
-    <Layout name="Fencing" printResolution="300" worldFileMap="" units="mm">
-      <Snapper snapToItems="1" snapToGuides="1" tolerance="5" snapToGrid="0"/>
-      <Grid resUnits="mm" offsetUnits="mm" offsetY="0" offsetX="0" resolution="10"/>
+    <Layout units="mm" printResolution="300" worldFileMap="" name="Fencing">
+      <Snapper snapToGuides="1" tolerance="5" snapToGrid="0" snapToItems="1"/>
+      <Grid resolution="10" offsetY="0" offsetX="0" offsetUnits="mm" resUnits="mm"/>
       <PageCollection>
-        <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+        <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="255,255,255,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="no" type="QString" name="outline_style"/>
-              <Option value="0.26" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+              <Option type="QString" value="255,255,255,255" name="color"/>
+              <Option type="QString" value="miter" name="joinstyle"/>
+              <Option type="QString" value="0,0" name="offset"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+              <Option type="QString" value="MM" name="offset_unit"/>
+              <Option type="QString" value="0,0,0,255" name="outline_color"/>
+              <Option type="QString" value="no" name="outline_style"/>
+              <Option type="QString" value="0.26" name="outline_width"/>
+              <Option type="QString" value="MM" name="outline_width_unit"/>
+              <Option type="QString" value="solid" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
@@ -29245,49 +29335,49 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem outlineWidthM="0.3,mm" groupUuid="" position="0,0,mm" positionLock="false" templateUuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" uuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" type="65638" blendMode="0" size="297,210,mm" opacity="1" visibility="1" referencePoint="0" id="" frame="false" zValue="0" frameJoinStyle="miter" positionOnPage="0,0,mm" background="true" excludeFromExports="0" itemRotation="0">
-          <FrameColor red="0" green="0" blue="0" alpha="255"/>
-          <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+        <LayoutItem referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" groupUuid="" positionOnPage="0,0,mm" positionLock="false" frameJoinStyle="miter" frame="false" type="65638" outlineWidthM="0.3,mm" templateUuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" background="true" size="297,210,mm" zValue="0" uuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" opacity="1" position="0,0,mm" excludeFromExports="0">
+          <FrameColor alpha="255" red="0" blue="0" green="0"/>
+          <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="255,255,255,255" type="QString" name="color"/>
-                <Option value="miter" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="255,255,255,255" name="color"/>
+                <Option type="QString" value="miter" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                <Option type="QString" value="no" name="outline_style"/>
+                <Option type="QString" value="0.26" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -29302,9 +29392,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -29312,47 +29402,47 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem outlineWidthM="0.3,mm" valign="64" groupUuid="" position="6.76779,190.27,mm" positionLock="true" templateUuid="{00558977-061b-4811-9651-3f50eed14a4c}" uuid="{00558977-061b-4811-9651-3f50eed14a4c}" type="65641" blendMode="0" size="148.46,7.36972,mm" opacity="1" visibility="1" htmlState="0" referencePoint="0" marginX="1" id="" halign="1" frame="false" zValue="11" labelText="FENCING: [% &quot;name&quot; %]" frameJoinStyle="miter" positionOnPage="6.76779,190.27,mm" background="false" marginY="1" excludeFromExports="0" itemRotation="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem marginY="1" referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" htmlState="0" groupUuid="" positionOnPage="6.76779,190.27,mm" positionLock="true" frameJoinStyle="miter" frame="false" type="65641" outlineWidthM="0.3,mm" templateUuid="{00558977-061b-4811-9651-3f50eed14a4c}" background="false" size="148.46,7.36972,mm" labelText="FENCING: [% &quot;name&quot; %]" zValue="11" uuid="{00558977-061b-4811-9651-3f50eed14a4c}" opacity="1" position="6.76779,190.27,mm" marginX="1" halign="1" valign="64" excludeFromExports="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="63" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="1" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="12" namedStyle="" forcedItalic="0" fontSizeUnit="Point" allowHtml="0">
+        <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="" fontUnderline="0" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" fontWeight="63" fontStrikeout="0" fontItalic="0" fontSize="12" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferNoFill="1" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="1.5"/>
-          <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeBorderWidth="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <text-buffer bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
+            <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -29367,65 +29457,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" valign="32" groupUuid="" position="211.295,197.64,mm" positionLock="true" templateUuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" uuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" type="65641" blendMode="0" size="27.7839,7.51682,mm" opacity="1" visibility="1" htmlState="0" referencePoint="0" marginX="1" id="" halign="2" frame="false" zValue="10" labelText="REVISION 1.0" frameJoinStyle="miter" positionOnPage="211.295,197.64,mm" background="false" marginY="1" excludeFromExports="0" itemRotation="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem marginY="1" referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" htmlState="0" groupUuid="" positionOnPage="211.295,197.64,mm" positionLock="true" frameJoinStyle="miter" frame="false" type="65641" outlineWidthM="0.3,mm" templateUuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" background="false" size="27.7839,7.51682,mm" labelText="REVISION 1.0" zValue="10" uuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" opacity="1" position="211.295,197.64,mm" marginX="1" halign="2" valign="32" excludeFromExports="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="50" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="1" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="12" namedStyle="" forcedItalic="0" fontSizeUnit="Point" allowHtml="0">
+        <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="" fontUnderline="0" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" fontWeight="50" fontStrikeout="0" fontItalic="0" fontSize="12" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferNoFill="1" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="1.5"/>
-          <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeBorderWidth="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <text-buffer bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
+            <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -29440,65 +29530,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" valign="32" groupUuid="" position="115.637,198.083,mm" positionLock="true" templateUuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" uuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" type="65641" blendMode="0" size="67.0856,7.80192,mm" opacity="1" visibility="1" htmlState="0" referencePoint="0" marginX="1" id="" halign="1" frame="false" zValue="9" labelText="Total cones: [% round(&quot;cone_len&quot;, 0) %]m" frameJoinStyle="miter" positionOnPage="115.637,198.083,mm" background="false" marginY="1" excludeFromExports="0" itemRotation="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem marginY="1" referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" htmlState="0" groupUuid="" positionOnPage="115.637,198.083,mm" positionLock="true" frameJoinStyle="miter" frame="false" type="65641" outlineWidthM="0.3,mm" templateUuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" background="false" size="67.0856,7.80192,mm" labelText="Total cones: [% round(&quot;cone_len&quot;, 0) %]m" zValue="9" uuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" opacity="1" position="115.637,198.083,mm" marginX="1" halign="1" valign="32" excludeFromExports="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="50" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="1" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="12" namedStyle="" forcedItalic="0" fontSizeUnit="Point" allowHtml="0">
+        <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="" fontUnderline="0" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" fontWeight="50" fontStrikeout="0" fontItalic="0" fontSize="12" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferNoFill="1" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="1.5"/>
-          <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeBorderWidth="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <text-buffer bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
+            <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -29513,65 +29603,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" valign="32" groupUuid="" position="59.5581,198.083,mm" positionLock="true" templateUuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" uuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" type="65641" blendMode="0" size="53.0017,7.80192,mm" opacity="1" visibility="1" htmlState="0" referencePoint="0" marginX="1" id="" halign="1" frame="false" zValue="8" labelText="Total fencing: [% round(&quot;fence_len&quot;, 0) %]m" frameJoinStyle="miter" positionOnPage="59.5581,198.083,mm" background="false" marginY="1" excludeFromExports="0" itemRotation="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem marginY="1" referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" htmlState="0" groupUuid="" positionOnPage="59.5581,198.083,mm" positionLock="true" frameJoinStyle="miter" frame="false" type="65641" outlineWidthM="0.3,mm" templateUuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" background="false" size="53.0017,7.80192,mm" labelText="Total fencing: [% round(&quot;fence_len&quot;, 0) %]m" zValue="8" uuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" opacity="1" position="59.5581,198.083,mm" marginX="1" halign="1" valign="32" excludeFromExports="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="50" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="1" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="12" namedStyle="" forcedItalic="0" fontSizeUnit="Point" allowHtml="0">
+        <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="" fontUnderline="0" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" fontWeight="50" fontStrikeout="0" fontItalic="0" fontSize="12" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferNoFill="1" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="1.5"/>
-          <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeBorderWidth="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <text-buffer bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
+            <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -29586,65 +29676,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" valign="32" groupUuid="" position="6.76779,198.083,mm" positionLock="true" templateUuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" uuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" type="65641" blendMode="0" size="52.7903,7.80192,mm" opacity="1" visibility="1" htmlState="0" referencePoint="0" marginX="1" id="" halign="1" frame="false" zValue="7" labelText="Page [% @atlas_featurenumber %]" frameJoinStyle="miter" positionOnPage="6.76779,198.083,mm" background="false" marginY="1" excludeFromExports="0" itemRotation="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem marginY="1" referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" htmlState="0" groupUuid="" positionOnPage="6.76779,198.083,mm" positionLock="true" frameJoinStyle="miter" frame="false" type="65641" outlineWidthM="0.3,mm" templateUuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" background="false" size="52.7903,7.80192,mm" labelText="Page [% @atlas_featurenumber %]" zValue="7" uuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" opacity="1" position="6.76779,198.083,mm" marginX="1" halign="1" valign="32" excludeFromExports="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="50" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="1" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="12" namedStyle="" forcedItalic="0" fontSizeUnit="Point" allowHtml="0">
+        <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="" fontUnderline="0" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" fontWeight="50" fontStrikeout="0" fontItalic="0" fontSize="12" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferNoFill="1" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="1.5"/>
-          <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeBorderWidth="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <text-buffer bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
+            <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -29659,39 +29749,39 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" groupUuid="" position="243.098,175.353,mm" anchorPoint="8" positionLock="true" svgFillColor="255,255,255,255" templateUuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" uuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" type="65640" blendMode="0" size="49.3143,29.8354,mm" opacity="1" visibility="1" svgBorderColor="0,0,0,255" northMode="0" northOffset="0" referencePoint="0" id="" frame="false" zValue="6" mode="1" frameJoinStyle="miter" resizeMode="0" positionOnPage="243.098,175.353,mm" file="../Gun_Run_Logo.png" svgBorderWidth="0.2" pictureRotation="0" background="false" pictureHeight="29.8354" pictureWidth="29.6535" excludeFromExports="0" itemRotation="0" mapUuid="">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" mapUuid="" svgBorderWidth="0.2" pictureHeight="29.8354" groupUuid="" positionOnPage="243.098,175.353,mm" positionLock="true" frameJoinStyle="miter" mode="1" frame="false" type="65640" outlineWidthM="0.3,mm" resizeMode="0" file="../Gun_Run_Logo.png" northOffset="0" templateUuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" background="false" svgFillColor="255,255,255,255" pictureRotation="0" size="49.3143,29.8354,mm" zValue="6" uuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" svgBorderColor="0,0,0,255" northMode="0" opacity="1" position="243.098,175.353,mm" excludeFromExports="0" pictureWidth="29.6535" anchorPoint="8">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedSource">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -29699,47 +29789,47 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" valign="64" groupUuid="" position="182.723,190.271,mm" positionLock="true" templateUuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" uuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" type="65641" blendMode="0" size="56.3557,7.36902,mm" opacity="1" visibility="1" htmlState="0" referencePoint="0" marginX="1" id="" halign="2" frame="false" zValue="5" labelText="Sunday, 20 September 2020" frameJoinStyle="miter" positionOnPage="182.723,190.271,mm" background="false" marginY="1" excludeFromExports="0" itemRotation="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem marginY="1" referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" htmlState="0" groupUuid="" positionOnPage="182.723,190.271,mm" positionLock="true" frameJoinStyle="miter" frame="false" type="65641" outlineWidthM="0.3,mm" templateUuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" background="false" size="56.3557,7.36902,mm" labelText="Sunday, 20 September 2020" zValue="5" uuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" opacity="1" position="182.723,190.271,mm" marginX="1" halign="2" valign="64" excludeFromExports="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="50" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="1" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="12" namedStyle="" forcedItalic="0" fontSizeUnit="Point" allowHtml="0">
+        <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="" fontUnderline="0" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" fontWeight="50" fontStrikeout="0" fontItalic="0" fontSize="12" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferNoFill="1" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="1.5"/>
-          <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeBorderWidth="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <text-buffer bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
+            <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -29754,60 +29844,60 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" groupUuid="" position="6.91779,197.79,mm" positionLock="true" templateUuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" uuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" type="65643" blendMode="0" size="232.01,0.14328,mm" opacity="1" visibility="1" referencePoint="0" id="" frame="false" zValue="4" shapeType="1" cornerRadiusMeasure="0,mm" frameJoinStyle="miter" positionOnPage="6.91779,197.79,mm" background="false" excludeFromExports="0" itemRotation="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" groupUuid="" positionOnPage="6.91779,197.79,mm" positionLock="true" frameJoinStyle="miter" frame="false" type="65643" outlineWidthM="0.3,mm" shapeType="1" cornerRadiusMeasure="0,mm" templateUuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" background="false" size="232.01,0.14328,mm" zValue="4" uuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" opacity="1" position="6.91779,197.79,mm" excludeFromExports="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+        <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="0,0,0,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="solid" type="QString" name="outline_style"/>
-              <Option value="0.3" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+              <Option type="QString" value="0,0,0,255" name="color"/>
+              <Option type="QString" value="miter" name="joinstyle"/>
+              <Option type="QString" value="0,0" name="offset"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+              <Option type="QString" value="MM" name="offset_unit"/>
+              <Option type="QString" value="0,0,0,255" name="outline_color"/>
+              <Option type="QString" value="solid" name="outline_style"/>
+              <Option type="QString" value="0.3" name="outline_width"/>
+              <Option type="QString" value="MM" name="outline_width_unit"/>
+              <Option type="QString" value="solid" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="0,0,0,255"/>
@@ -29822,55 +29912,55 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem lineJoinStyle="round" outlineWidthM="0.3,mm" numUnitsPerSegment="10" frameJoinStyle="miter" excludeFromExports="0" height="2" mapUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" background="false" unitLabel="m" maxBarWidth="100" lineCapStyle="square" size="95.0404,15.8378,mm" numSegments="2" outlineWidth="0.2" type="65646" boxContentSpace="0.2" id="" labelVerticalPlacement="0" positionLock="true" blendMode="0" positionOnPage="6.76779,2.8482,mm" templateUuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" frame="false" numMapUnitsPerScaleBarUnit="1" opacity="1" uuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" labelHorizontalPlacement="0" style="Double Box" referencePoint="0" visibility="1" labelBarSpace="1" itemRotation="0" segmentMillimeters="28.4264" segmentSizeMode="1" minBarWidth="25" numSegmentsLeft="2" numSubdivisions="1" groupUuid="" position="6.76779,2.8482,mm" unitType="meters" subdivisionsHeight="1.5" alignment="0" zValue="3">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem mapUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" alignment="0" size="95.0404,15.8378,mm" unitLabel="m" templateUuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" blendMode="0" labelBarSpace="1" position="6.76779,2.8482,mm" groupUuid="" referencePoint="0" unitType="meters" lineCapStyle="square" itemRotation="0" maxBarWidth="100" numMapUnitsPerScaleBarUnit="1" subdivisionsHeight="1.5" outlineWidthM="0.3,mm" labelHorizontalPlacement="0" outlineWidth="0.2" background="false" numSubdivisions="1" visibility="1" numSegments="2" segmentSizeMode="1" numUnitsPerSegment="10" lineJoinStyle="round" positionLock="true" zValue="3" id="" labelVerticalPlacement="0" positionOnPage="6.76779,2.8482,mm" excludeFromExports="0" style="Double Box" segmentMillimeters="28.4264" type="65646" minBarWidth="25" uuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" opacity="1" boxContentSpace="0.2" frame="false" frameJoinStyle="miter" numSegmentsLeft="2" height="2">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="50" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="1" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="12" namedStyle="" forcedItalic="0" fontSizeUnit="Point" allowHtml="0">
+        <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="" fontUnderline="0" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" fontWeight="50" fontStrikeout="0" fontItalic="0" fontSize="12" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferNoFill="1" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="0"/>
-          <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeBorderWidth="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <text-buffer bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="0" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
+            <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -29885,75 +29975,75 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
-        <strokeColor red="0" green="0" blue="0" alpha="255"/>
+        <strokeColor alpha="255" red="0" blue="0" green="0"/>
         <numericFormat id="basic">
           <Option type="Map">
-            <Option value="" type="QChar" name="decimal_separator"/>
-            <Option value="6" type="int" name="decimals"/>
-            <Option value="0" type="int" name="rounding_type"/>
-            <Option value="false" type="bool" name="show_plus"/>
-            <Option value="true" type="bool" name="show_thousand_separator"/>
-            <Option value="false" type="bool" name="show_trailing_zeros"/>
-            <Option value="" type="QChar" name="thousand_separator"/>
+            <Option type="QChar" value="" name="decimal_separator"/>
+            <Option type="int" value="6" name="decimals"/>
+            <Option type="int" value="0" name="rounding_type"/>
+            <Option type="bool" value="false" name="show_plus"/>
+            <Option type="bool" value="true" name="show_thousand_separator"/>
+            <Option type="bool" value="false" name="show_trailing_zeros"/>
+            <Option type="QChar" value="" name="thousand_separator"/>
           </Option>
         </numericFormat>
-        <fillColor red="0" green="0" blue="0" alpha="255"/>
-        <fillColor2 red="255" green="255" blue="255" alpha="255"/>
+        <fillColor alpha="255" red="0" blue="0" green="0"/>
+        <fillColor2 alpha="255" red="255" blue="255" green="255"/>
         <lineSymbol>
-          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="round" type="QString" name="joinstyle"/>
-                <Option value="0,0,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.2" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="round" name="joinstyle"/>
+                <Option type="QString" value="0,0,0,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.2" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -29984,52 +30074,52 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </lineSymbol>
         <divisionLineSymbol>
-          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="round" type="QString" name="joinstyle"/>
-                <Option value="0,0,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.2" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="round" name="joinstyle"/>
+                <Option type="QString" value="0,0,0,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.2" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -30060,52 +30150,52 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </divisionLineSymbol>
         <subdivisionLineSymbol>
-          <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+            <layer locked="0" class="SimpleLine" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="0" type="QString" name="align_dash_pattern"/>
-                <Option value="square" type="QString" name="capstyle"/>
-                <Option value="5;2" type="QString" name="customdash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                <Option value="MM" type="QString" name="customdash_unit"/>
-                <Option value="0" type="QString" name="dash_pattern_offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                <Option value="0" type="QString" name="draw_inside_polygon"/>
-                <Option value="round" type="QString" name="joinstyle"/>
-                <Option value="0,0,0,255" type="QString" name="line_color"/>
-                <Option value="solid" type="QString" name="line_style"/>
-                <Option value="0.2" type="QString" name="line_width"/>
-                <Option value="MM" type="QString" name="line_width_unit"/>
-                <Option value="0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="0" type="QString" name="ring_filter"/>
-                <Option value="0" type="QString" name="trim_distance_end"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                <Option value="0" type="QString" name="trim_distance_start"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                <Option value="0" type="QString" name="use_custom_dash"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                <Option type="QString" value="0" name="align_dash_pattern"/>
+                <Option type="QString" value="square" name="capstyle"/>
+                <Option type="QString" value="5;2" name="customdash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                <Option type="QString" value="MM" name="customdash_unit"/>
+                <Option type="QString" value="0" name="dash_pattern_offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                <Option type="QString" value="0" name="draw_inside_polygon"/>
+                <Option type="QString" value="round" name="joinstyle"/>
+                <Option type="QString" value="0,0,0,255" name="line_color"/>
+                <Option type="QString" value="solid" name="line_style"/>
+                <Option type="QString" value="0.2" name="line_width"/>
+                <Option type="QString" value="MM" name="line_width_unit"/>
+                <Option type="QString" value="0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="0" name="ring_filter"/>
+                <Option type="QString" value="0" name="trim_distance_end"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                <Option type="QString" value="0" name="trim_distance_start"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                <Option type="QString" value="0" name="use_custom_dash"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
               </Option>
               <prop k="align_dash_pattern" v="0"/>
               <prop k="capstyle" v="square"/>
@@ -30136,36 +30226,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </subdivisionLineSymbol>
         <fillSymbol1>
-          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="0,0,0,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="0,0,0,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                <Option type="QString" value="no" name="outline_style"/>
+                <Option type="QString" value="0.26" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="0,0,0,255"/>
@@ -30180,36 +30270,36 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol1>
         <fillSymbol2>
-          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="255,255,255,255" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="255,255,255,255" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                <Option type="QString" value="no" name="outline_style"/>
+                <Option type="QString" value="0.26" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -30224,24 +30314,24 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </fillSymbol2>
       </LayoutItem>
-      <LayoutItem rasterBorderWidth="0" outlineWidthM="0.3,mm" maxSymbolSize="0" rasterBorderColor="0,0,0,255" frameJoinStyle="miter" excludeFromExports="0" title="" columnCount="1" background="true" rasterBorder="1" boxSpace="2" size="38.1563,54.9504,mm" map_uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" legendFilterByAtlas="0" wmsLegendHeight="25" columnSpace="2" type="65642" symbolAlignment="1" id="" positionLock="true" blendMode="0" positionOnPage="256.808,2.9982,mm" splitLayer="0" resizeToContents="0" templateUuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" frame="true" opacity="1" uuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" minSymbolSize="0" fontColor="#000000" lineSpacing="1" referencePoint="0" visibility="1" wrapChar="" itemRotation="0" symbolWidth="7" wmsLegendWidth="50" groupUuid="" position="256.808,2.9982,mm" symbolHeight="4" equalColumnWidth="1" titleAlignment="1" zValue="2">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem splitLayer="0" size="38.1563,54.9504,mm" legendFilterByAtlas="0" boxSpace="2" templateUuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" blendMode="0" maxSymbolSize="0" position="256.808,2.9982,mm" groupUuid="" wrapChar="" minSymbolSize="0" referencePoint="0" symbolAlignment="1" itemRotation="0" title="" equalColumnWidth="1" resizeToContents="0" wmsLegendHeight="25" columnCount="1" outlineWidthM="0.3,mm" rasterBorder="1" background="true" visibility="1" symbolHeight="4" fontColor="#000000" positionLock="true" zValue="2" titleAlignment="1" lineSpacing="1" columnSpace="2" id="" rasterBorderColor="0,0,0,255" positionOnPage="256.808,2.9982,mm" excludeFromExports="0" rasterBorderWidth="0" type="65642" wmsLegendWidth="50" uuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" opacity="1" frame="true" symbolWidth="7" map_uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" frameJoinStyle="miter">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -30249,52 +30339,52 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style name="title" indent="0" alignment="1">
-            <styleFont bold="1" style="Bold" italic="0" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Bold" underline="0" strikethrough="0"/>
+          <style indent="0" alignment="1" name="title">
+            <styleFont style="Bold" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Bold" strikethrough="0" italic="0" underline="0" bold="1"/>
           </style>
-          <style name="group" indent="0" alignment="1" marginTop="3">
-            <styleFont bold="1" style="Semibold" italic="0" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" underline="0" strikethrough="0"/>
+          <style marginTop="3" indent="0" alignment="1" name="group">
+            <styleFont style="Semibold" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0" italic="0" underline="0" bold="1"/>
           </style>
-          <style name="subgroup" indent="0" alignment="1" marginTop="3">
-            <styleFont bold="1" style="Semibold" italic="0" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" underline="0" strikethrough="0"/>
+          <style marginTop="3" indent="0" alignment="1" name="subgroup">
+            <styleFont style="Semibold" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0" italic="0" underline="0" bold="1"/>
           </style>
-          <style name="symbol" indent="0" alignment="1" marginTop="2.5">
-            <styleFont bold="0" style="" italic="0" description="Myriad Pro,9,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0"/>
+          <style marginTop="2.5" indent="0" alignment="1" name="symbol">
+            <styleFont style="" description="Myriad Pro,9,-1,5,50,0,0,0,0,0" strikethrough="0" italic="0" underline="0" bold="0"/>
           </style>
-          <style marginLeft="2" name="symbolLabel" indent="0" alignment="1" marginTop="2">
-            <styleFont bold="0" style="Regular" italic="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular" underline="0" strikethrough="0"/>
+          <style marginTop="2" marginLeft="2" indent="0" alignment="1" name="symbolLabel">
+            <styleFont style="Regular" description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular" strikethrough="0" italic="0" underline="0" bold="0"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group checked="Qt::Checked" name="Fencing and Cones" groupLayer="" expanded="1">
+          <layer-tree-group expanded="1" groupLayer="" checked="Qt::Checked" name="Fencing and Cones">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer checked="Qt::Checked" legend_exp="" source="./fencing.shp|layername=fencing" name="fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" providerKey="ogr" legend_split_behavior="0" patch_size="0,0" expanded="1">
+            <layer-tree-layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" expanded="1" legend_split_behavior="0" source="./fencing.shp|layername=fencing" legend_exp="" providerKey="ogr" patch_size="0,0" checked="Qt::Checked" name="fencing">
               <customproperties>
                 <Option type="Map">
-                  <Option value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" type="QString" name="expandedLegendNodes"/>
-                  <Option value="" type="QString" name="legend/expressionFilter"/>
-                  <Option value="false" type="QString" name="legend/expressionFilterEnabled"/>
-                  <Option value="1,2,3" type="QString" name="legend/node-order"/>
-                  <Option value="hidden" type="QString" name="legend/title-style"/>
+                  <Option type="QString" value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" name="expandedLegendNodes"/>
+                  <Option type="QString" value="" name="legend/expressionFilter"/>
+                  <Option type="QString" value="false" name="legend/expressionFilterEnabled"/>
+                  <Option type="QString" value="1,2,3" name="legend/node-order"/>
+                  <Option type="QString" value="hidden" name="legend/title-style"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
-          <layer-tree-group checked="Qt::Checked" name="Routes" groupLayer="" expanded="1">
+          <layer-tree-group expanded="1" groupLayer="" checked="Qt::Checked" name="Routes">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer checked="Qt::Checked" legend_exp="" source="./all_routes.shp|layername=all_routes" name="all_routes" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" providerKey="ogr" legend_split_behavior="0" patch_size="0,0" expanded="1">
+            <layer-tree-layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" expanded="1" legend_split_behavior="0" source="./all_routes.shp|layername=all_routes" legend_exp="" providerKey="ogr" patch_size="0,0" checked="Qt::Checked" name="all_routes">
               <customproperties>
                 <Option type="Map">
                   <Option type="invalid" name="expandedLegendNodes"/>
-                  <Option value="1,2,3" type="QString" name="legend/node-order"/>
-                  <Option value="hidden" type="QString" name="legend/title-style"/>
+                  <Option type="QString" value="1,2,3" name="legend/node-order"/>
+                  <Option type="QString" value="hidden" name="legend/title-style"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -30302,44 +30392,44 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" groupUuid="" position="6.76779,9.35102,mm" positionLock="true" templateUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" type="65639" blendMode="0" followPresetName="Fencing" keepLayerSet="false" size="283.418,180.92,mm" opacity="0.9" visibility="1" referencePoint="0" id="" frame="false" followPreset="true" zValue="1" frameJoinStyle="miter" labelMargin="0,mm" positionOnPage="6.76779,9.35102,mm" mapRotation="0" background="false" excludeFromExports="0" itemRotation="0" drawCanvasItems="false" mapFlags="0" isTemporal="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" drawCanvasItems="false" mapRotation="0" mapFlags="0" groupUuid="" positionOnPage="6.76779,9.35102,mm" positionLock="true" frameJoinStyle="miter" followPresetName="Fencing" frame="false" type="65639" outlineWidthM="0.3,mm" labelMargin="0,mm" templateUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" background="false" size="283.418,180.92,mm" zValue="1" uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" opacity="0.9" position="6.76779,9.35102,mm" keepLayerSet="false" excludeFromExports="0" isTemporal="0" followPreset="true">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedMapRotation">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="expression"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="" name="expression"/>
                   <Option type="Map" name="transformer">
                     <Option type="Map" name="d">
-                      <Option value="1" type="double" name="exponent"/>
-                      <Option value="360" type="double" name="maxOutput"/>
-                      <Option value="0" type="double" name="maxValue"/>
-                      <Option value="0" type="double" name="minOutput"/>
-                      <Option value="0" type="double" name="minValue"/>
-                      <Option value="0" type="double" name="nullOutput"/>
+                      <Option type="double" value="1" name="exponent"/>
+                      <Option type="double" value="360" name="maxOutput"/>
+                      <Option type="double" value="0" name="maxValue"/>
+                      <Option type="double" value="0" name="minOutput"/>
+                      <Option type="double" value="0" name="minValue"/>
+                      <Option type="double" value="0" name="nullOutput"/>
                     </Option>
-                    <Option value="0" type="int" name="t"/>
+                    <Option type="int" value="0" name="t"/>
                   </Option>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedRotation">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="angle" type="QString" name="field"/>
-                  <Option value="2" type="int" name="type"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="angle" name="field"/>
+                  <Option type="int" value="2" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.41635400827248503" ymax="-33.90364055490629625" ymin="-33.90421228789515595" xmax="18.4172496509604926"/>
+        <Extent ymax="-33.90364055490629625" xmin="18.41635400827248503" ymin="-33.90421228789515595" xmax="18.4172496509604926"/>
         <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>
@@ -30354,45 +30444,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid show="0" rotatedTicksEnabled="0" gridFrameStyle="0" crossLength="3" gridFrameMargin="0" leftFrameDivisions="0" bottomFrameDivisions="0" gridFramePenThickness="0.5" topAnnotationDisplay="3" topAnnotationPosition="1" rotatedTicksMinimumAngle="0" name="Grid 1" showAnnotation="0" rotatedAnnotationsEnabled="0" rotatedTicksLengthMode="0" annotationExpression="" intervalX="5" bottomAnnotationPosition="1" rightAnnotationDisplay="3" rotatedAnnotationsMinimumAngle="0" annotationPrecision="3" frameFillColor1="255,255,255,255" blendMode="0" offsetY="0" gridFrameWidth="2" leftAnnotationDisplay="3" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" rotatedAnnotationsMarginToCorner="0" topFrameDivisions="0" topAnnotationDirection="0" rightAnnotationPosition="1" rotatedTicksMarginToCorner="0" gridStyle="0" minimumIntervalWidth="50" intervalY="5" unit="1" maximumIntervalWidth="100" gridFrameSideFlags="15" frameAnnotationDistance="1" frameFillColor2="0,0,0,255" rightAnnotationDirection="0" position="3" bottomAnnotationDisplay="3" leftAnnotationPosition="1" rotatedAnnotationsLengthMode="0" annotationFormat="4" gridFramePenColor="0,0,0,255" leftAnnotationDirection="0" rightFrameDivisions="0" bottomAnnotationDirection="0" offsetX="0">
+        <ComposerMapGrid bottomAnnotationPosition="1" frameFillColor2="0,0,0,255" blendMode="0" bottomAnnotationDisplay="3" name="Grid 1" frameFillColor1="255,255,255,255" position="3" bottomFrameDivisions="0" topAnnotationPosition="1" crossLength="3" leftAnnotationDisplay="3" intervalY="5" rotatedAnnotationsMarginToCorner="0" gridFrameStyle="0" annotationFormat="4" topAnnotationDirection="0" leftFrameDivisions="0" topFrameDivisions="0" annotationPrecision="3" rotatedTicksMinimumAngle="0" rightFrameDivisions="0" maximumIntervalWidth="100" unit="1" rotatedTicksEnabled="0" topAnnotationDisplay="3" leftAnnotationPosition="1" show="0" rotatedTicksMarginToCorner="0" rotatedTicksLengthMode="0" gridStyle="0" rotatedAnnotationsMinimumAngle="0" minimumIntervalWidth="50" bottomAnnotationDirection="0" annotationExpression="" intervalX="5" offsetY="0" offsetX="0" gridFramePenColor="0,0,0,255" gridFrameMargin="0" gridFrameWidth="2" rightAnnotationDisplay="3" rotatedAnnotationsEnabled="0" leftAnnotationDirection="0" rightAnnotationDirection="0" gridFrameSideFlags="15" gridFramePenThickness="0.5" showAnnotation="0" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" rightAnnotationPosition="1" frameAnnotationDistance="1" rotatedAnnotationsLengthMode="0">
           <lineStyle>
-            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="195,195,195,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="195,195,195,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -30423,44 +30513,44 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+              <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="angle"/>
-                  <Option value="square" type="QString" name="cap_style"/>
-                  <Option value="0,0,0,255" type="QString" name="color"/>
-                  <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="circle" type="QString" name="name"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                  <Option value="solid" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="diameter" type="QString" name="scale_method"/>
-                  <Option value="2" type="QString" name="size"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="size_unit"/>
-                  <Option value="1" type="QString" name="vertical_anchor_point"/>
+                  <Option type="QString" value="0" name="angle"/>
+                  <Option type="QString" value="square" name="cap_style"/>
+                  <Option type="QString" value="0,0,0,255" name="color"/>
+                  <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="circle" name="name"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                  <Option type="QString" value="solid" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="diameter" name="scale_method"/>
+                  <Option type="QString" value="2" name="size"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="size_unit"/>
+                  <Option type="QString" value="1" name="vertical_anchor_point"/>
                 </Option>
                 <prop k="angle" v="0"/>
                 <prop k="cap_style" v="square"/>
@@ -30483,9 +30573,9 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -30502,32 +30592,32 @@ def my_form_open(dialog, layer, feature):
             <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
             <geographicflag>false</geographicflag>
           </spatialrefsys>
-          <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="50" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="1" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="10" namedStyle="" forcedItalic="0" fontSizeUnit="Point" allowHtml="0">
+          <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="" fontUnderline="0" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" fontWeight="50" fontStrikeout="0" fontItalic="0" fontSize="10" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" textOrientation="horizontal">
             <families/>
-            <text-buffer bufferNoFill="1" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="1.5"/>
-            <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeBorderWidth="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-              <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <text-buffer bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+            <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskType="0"/>
+            <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
+              <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                    <Option value="255,255,255,255" type="QString" name="color"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                    <Option value="no" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="solid" type="QString" name="style"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                    <Option type="QString" value="255,255,255,255" name="color"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                    <Option type="QString" value="no" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="solid" name="style"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -30542,29 +30632,29 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+            <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -30572,62 +30662,62 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap margin="0.40000000000000002" atlasDriven="1" scalingMode="2"/>
+        <AtlasMap margin="0.40000000000000002" scalingMode="2" atlasDriven="1"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" enabled="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clipSource="" enabled="0" clippingType="0"/>
+        <itemClippingSettings clipSource="" forceLabelsInside="0" clippingType="0" enabled="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" type="QString" name="atlasRasterFormat"/>
-          <Option value="0" type="QString" name="forceVector"/>
-          <Option value="true" type="QString" name="imageAntialias"/>
-          <Option value="0" type="QString" name="imageCropMarginBottom"/>
-          <Option value="0" type="QString" name="imageCropMarginLeft"/>
-          <Option value="0" type="QString" name="imageCropMarginRight"/>
-          <Option value="0" type="QString" name="imageCropMarginTop"/>
-          <Option value="false" type="QString" name="imageCropToContents"/>
-          <Option value="1" type="QString" name="pdfAppendGeoreference"/>
-          <Option value="0" type="QString" name="pdfCreateGeoPdf"/>
-          <Option value="0" type="QString" name="pdfDisableRasterTiles"/>
-          <Option value="0" type="QString" name="pdfExportGeoPdfFeatures"/>
-          <Option value="" type="QString" name="pdfExportThemes"/>
-          <Option value="1" type="QString" name="pdfIncludeMetadata"/>
-          <Option value="0" type="QString" name="pdfOgcBestPracticeFormat"/>
-          <Option value="1" type="QString" name="pdfSimplify"/>
-          <Option value="0" type="QString" name="pdfTextFormat"/>
-          <Option value="true" type="QString" name="rasterize"/>
+          <Option type="QString" value="png" name="atlasRasterFormat"/>
+          <Option type="QString" value="0" name="forceVector"/>
+          <Option type="QString" value="true" name="imageAntialias"/>
+          <Option type="QString" value="0" name="imageCropMarginBottom"/>
+          <Option type="QString" value="0" name="imageCropMarginLeft"/>
+          <Option type="QString" value="0" name="imageCropMarginRight"/>
+          <Option type="QString" value="0" name="imageCropMarginTop"/>
+          <Option type="QString" value="false" name="imageCropToContents"/>
+          <Option type="QString" value="1" name="pdfAppendGeoreference"/>
+          <Option type="QString" value="0" name="pdfCreateGeoPdf"/>
+          <Option type="QString" value="0" name="pdfDisableRasterTiles"/>
+          <Option type="QString" value="0" name="pdfExportGeoPdfFeatures"/>
+          <Option type="QString" value="" name="pdfExportThemes"/>
+          <Option type="QString" value="1" name="pdfIncludeMetadata"/>
+          <Option type="QString" value="0" name="pdfOgcBestPracticeFormat"/>
+          <Option type="QString" value="1" name="pdfSimplify"/>
+          <Option type="QString" value="0" name="pdfTextFormat"/>
+          <Option type="QString" value="true" name="rasterize"/>
         </Option>
       </customproperties>
-      <Atlas hideCoverage="1" pageNameExpression="&quot;name&quot;" sortFeatures="1" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20SUM(cone_len)%20AS%20[cone_len],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22" filenamePattern="'output_'||@atlas_featurenumber" coverageLayerName="fence_groups" sortAscending="1" filterFeatures="0" coverageLayer="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792" sortKey="group" coverageLayerProvider="virtual" enabled="1"/>
+      <Atlas sortKey="group" sortAscending="1" filenamePattern="'output_'||@atlas_featurenumber" coverageLayer="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792" filterFeatures="0" hideCoverage="1" enabled="1" coverageLayerProvider="virtual" pageNameExpression="&quot;name&quot;" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20SUM(cone_len)%20AS%20[cone_len],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22" coverageLayerName="fence_groups" sortFeatures="1"/>
     </Layout>
-    <Layout name="Ask Me" printResolution="144" worldFileMap="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" units="mm">
-      <Snapper snapToItems="1" snapToGuides="1" tolerance="5" snapToGrid="0"/>
-      <Grid resUnits="mm" offsetUnits="mm" offsetY="0" offsetX="0" resolution="9"/>
+    <Layout units="mm" printResolution="144" worldFileMap="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" name="Ask Me">
+      <Snapper snapToGuides="1" tolerance="5" snapToGrid="0" snapToItems="1"/>
+      <Grid resolution="9" offsetY="0" offsetX="0" offsetUnits="mm" resUnits="mm"/>
       <PageCollection>
-        <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+        <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="255,255,255,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="no" type="QString" name="outline_style"/>
-              <Option value="0.26" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+              <Option type="QString" value="255,255,255,255" name="color"/>
+              <Option type="QString" value="miter" name="joinstyle"/>
+              <Option type="QString" value="0,0" name="offset"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+              <Option type="QString" value="MM" name="offset_unit"/>
+              <Option type="QString" value="0,0,0,255" name="outline_color"/>
+              <Option type="QString" value="no" name="outline_style"/>
+              <Option type="QString" value="0.26" name="outline_width"/>
+              <Option type="QString" value="MM" name="outline_width_unit"/>
+              <Option type="QString" value="solid" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
@@ -30642,49 +30732,49 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem outlineWidthM="0.3,mm" groupUuid="" position="0,0,mm" positionLock="false" templateUuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" uuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" type="65638" blendMode="0" size="297,210,mm" opacity="1" visibility="1" referencePoint="0" id="" frame="false" zValue="0" frameJoinStyle="miter" positionOnPage="0,0,mm" background="true" excludeFromExports="0" itemRotation="0">
-          <FrameColor red="0" green="0" blue="0" alpha="255"/>
-          <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+        <LayoutItem referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" groupUuid="" positionOnPage="0,0,mm" positionLock="false" frameJoinStyle="miter" frame="false" type="65638" outlineWidthM="0.3,mm" templateUuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" background="true" size="297,210,mm" zValue="0" uuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" opacity="1" position="0,0,mm" excludeFromExports="0">
+          <FrameColor alpha="255" red="0" blue="0" green="0"/>
+          <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="255,255,255,255" type="QString" name="color"/>
-                <Option value="miter" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="255,255,255,255" name="color"/>
+                <Option type="QString" value="miter" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                <Option type="QString" value="no" name="outline_style"/>
+                <Option type="QString" value="0.26" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -30699,59 +30789,59 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide position="0" page="0" orientation="2" units="mm"/>
+          <Guide page="0" units="mm" orientation="2" position="0"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem outlineWidthM="0.3,mm" valign="64" groupUuid="" position="4.43449,186.634,mm" positionLock="false" templateUuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" uuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" type="65641" blendMode="0" size="83.9998,10.4638,mm" opacity="1" visibility="1" htmlState="0" referencePoint="0" marginX="1" id="" halign="1" frame="false" zValue="8" labelText="Directions to Start of Race" frameJoinStyle="miter" positionOnPage="4.43449,186.634,mm" background="false" marginY="1" excludeFromExports="0" itemRotation="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem marginY="1" referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" htmlState="0" groupUuid="" positionOnPage="4.43449,186.634,mm" positionLock="false" frameJoinStyle="miter" frame="false" type="65641" outlineWidthM="0.3,mm" templateUuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" background="false" size="83.9998,10.4638,mm" labelText="Directions to Start of Race" zValue="8" uuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" opacity="1" position="4.43449,186.634,mm" marginX="1" halign="1" valign="64" excludeFromExports="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="50" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="1" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="14" namedStyle="" forcedItalic="0" fontSizeUnit="Point" allowHtml="0">
+        <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="" fontUnderline="0" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" fontWeight="50" fontStrikeout="0" fontItalic="0" fontSize="14" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferNoFill="1" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="1.5"/>
-          <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeBorderWidth="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <text-buffer bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
+            <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -30766,65 +30856,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" valign="32" groupUuid="" position="4.43449,197.498,mm" positionLock="false" templateUuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" uuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" type="65641" blendMode="0" size="48.2923,9.511,mm" opacity="1" visibility="1" htmlState="0" referencePoint="0" marginX="1" id="" halign="1" frame="false" zValue="7" labelText="Gun Run" frameJoinStyle="miter" positionOnPage="4.43449,197.498,mm" background="false" marginY="1" excludeFromExports="0" itemRotation="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem marginY="1" referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" htmlState="0" groupUuid="" positionOnPage="4.43449,197.498,mm" positionLock="false" frameJoinStyle="miter" frame="false" type="65641" outlineWidthM="0.3,mm" templateUuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" background="false" size="48.2923,9.511,mm" labelText="Gun Run" zValue="7" uuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" opacity="1" position="4.43449,197.498,mm" marginX="1" halign="1" valign="32" excludeFromExports="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="50" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="1" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="12" namedStyle="" forcedItalic="0" fontSizeUnit="Point" allowHtml="0">
+        <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="" fontUnderline="0" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" fontWeight="50" fontStrikeout="0" fontItalic="0" fontSize="12" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferNoFill="1" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="1.5"/>
-          <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeBorderWidth="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <text-buffer bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
+            <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -30839,33 +30929,33 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem rasterBorderWidth="0" outlineWidthM="0.3,mm" maxSymbolSize="0" rasterBorderColor="0,0,0,255" frameJoinStyle="round" excludeFromExports="0" title="" columnCount="1" background="true" rasterBorder="1" boxSpace="2" size="59.0766,76,mm" map_uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" legendFilterByAtlas="0" wmsLegendHeight="25" columnSpace="0" type="65642" symbolAlignment="1" id="" positionLock="false" blendMode="0" positionOnPage="10.096,10.8563,mm" splitLayer="0" resizeToContents="1" templateUuid="{303369c1-d87e-43b5-837f-91af9bdece73}" frame="true" opacity="1" uuid="{303369c1-d87e-43b5-837f-91af9bdece73}" minSymbolSize="0" fontColor="#000000" lineSpacing="2" referencePoint="0" visibility="1" wrapChar="" itemRotation="0" symbolWidth="9" wmsLegendWidth="50" groupUuid="" position="10.096,10.8563,mm" legendFilterByMap="1" symbolHeight="5" equalColumnWidth="0" titleAlignment="1" zValue="6">
-        <FrameColor red="139" green="139" blue="139" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem splitLayer="0" size="59.0766,76,mm" legendFilterByAtlas="0" boxSpace="2" templateUuid="{303369c1-d87e-43b5-837f-91af9bdece73}" blendMode="0" maxSymbolSize="0" position="10.096,10.8563,mm" groupUuid="" wrapChar="" minSymbolSize="0" referencePoint="0" symbolAlignment="1" itemRotation="0" title="" equalColumnWidth="0" resizeToContents="1" wmsLegendHeight="25" columnCount="1" outlineWidthM="0.3,mm" rasterBorder="1" background="true" legendFilterByMap="1" visibility="1" symbolHeight="5" fontColor="#000000" positionLock="false" zValue="6" titleAlignment="1" lineSpacing="2" columnSpace="0" id="" rasterBorderColor="0,0,0,255" positionOnPage="10.096,10.8563,mm" excludeFromExports="0" rasterBorderWidth="0" type="65642" wmsLegendWidth="50" uuid="{303369c1-d87e-43b5-837f-91af9bdece73}" opacity="1" frame="true" symbolWidth="9" map_uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" frameJoinStyle="round">
+        <FrameColor alpha="255" red="139" blue="139" green="139"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -30873,52 +30963,52 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style name="title" indent="0" alignment="1">
-            <styleFont bold="0" style="" italic="0" description="Myriad Pro,16,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0"/>
+          <style indent="0" alignment="1" name="title">
+            <styleFont style="" description="Myriad Pro,16,-1,5,50,0,0,0,0,0" strikethrough="0" italic="0" underline="0" bold="0"/>
           </style>
-          <style name="group" indent="0" alignment="1">
-            <styleFont bold="1" style="Semibold" italic="0" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" underline="0" strikethrough="0"/>
+          <style indent="0" alignment="1" name="group">
+            <styleFont style="Semibold" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0" italic="0" underline="0" bold="1"/>
           </style>
-          <style name="subgroup" indent="0" alignment="1">
-            <styleFont bold="1" style="Semibold" italic="0" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" underline="0" strikethrough="0"/>
+          <style indent="0" alignment="1" name="subgroup">
+            <styleFont style="Semibold" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0" italic="0" underline="0" bold="1"/>
           </style>
-          <style name="symbol" indent="0" alignment="1" marginTop="2.5">
-            <styleFont bold="0" style="" italic="0" description="Myriad Pro,12,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0"/>
+          <style marginTop="2.5" indent="0" alignment="1" name="symbol">
+            <styleFont style="" description="Myriad Pro,12,-1,5,50,0,0,0,0,0" strikethrough="0" italic="0" underline="0" bold="0"/>
           </style>
-          <style marginLeft="3" name="symbolLabel" indent="0" alignment="1" marginTop="2.5">
-            <styleFont bold="0" style="Regular" italic="0" description="Myriad Pro,14,-1,5,50,0,0,0,0,0,Regular" underline="0" strikethrough="0"/>
+          <style marginTop="2.5" marginLeft="3" indent="0" alignment="1" name="symbolLabel">
+            <styleFont style="Regular" description="Myriad Pro,14,-1,5,50,0,0,0,0,0,Regular" strikethrough="0" italic="0" underline="0" bold="0"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group checked="Qt::Checked" name="Ask Me" groupLayer="" expanded="1">
+          <layer-tree-group expanded="1" groupLayer="" checked="Qt::Checked" name="Ask Me">
             <customproperties>
               <Option type="Map">
-                <Option value="hidden" type="QString" name="legend/title-style"/>
+                <Option type="QString" value="hidden" name="legend/title-style"/>
               </Option>
             </customproperties>
-            <layer-tree-layer checked="Qt::Checked" legend_exp="" source="./poi_labels.shp|layername=poi_labels" name="poi_labels" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" providerKey="ogr" legend_split_behavior="0" patch_size="0,0" expanded="1">
+            <layer-tree-layer id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" expanded="1" legend_split_behavior="0" source="./poi_labels.shp|layername=poi_labels" legend_exp="" providerKey="ogr" patch_size="0,0" checked="Qt::Checked" name="poi_labels">
               <customproperties>
                 <Option type="Map">
-                  <Option value="Start/Finish" type="QString" name="legend/label-0"/>
-                  <Option value="Toilets" type="QString" name="legend/label-1"/>
-                  <Option value="Tog Bag Drop-off" type="QString" name="legend/label-2"/>
-                  <Option value="Road Closed to Cars" type="QString" name="legend/label-3"/>
-                  <Option value="MyCiti Drop-off" type="QString" name="legend/label-4"/>
-                  <Option value="Parking" type="QString" name="legend/label-5"/>
-                  <Option value="hidden" type="QString" name="legend/title-style"/>
+                  <Option type="QString" value="Start/Finish" name="legend/label-0"/>
+                  <Option type="QString" value="Toilets" name="legend/label-1"/>
+                  <Option type="QString" value="Tog Bag Drop-off" name="legend/label-2"/>
+                  <Option type="QString" value="Road Closed to Cars" name="legend/label-3"/>
+                  <Option type="QString" value="MyCiti Drop-off" name="legend/label-4"/>
+                  <Option type="QString" value="Parking" name="legend/label-5"/>
+                  <Option type="QString" value="hidden" name="legend/title-style"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
-            <layer-tree-layer checked="Qt::Checked" legend_exp="" source="./directions_to_start.shp|layername=directions_to_start" name="directions_to_start" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" providerKey="ogr" legend_split_behavior="0" patch_size="0,0" expanded="1">
+            <layer-tree-layer id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" expanded="1" legend_split_behavior="0" source="./directions_to_start.shp|layername=directions_to_start" legend_exp="" providerKey="ogr" patch_size="0,0" checked="Qt::Checked" name="directions_to_start">
               <customproperties>
                 <Option type="Map">
-                  <Option value="To 21KM Start (06:30)" type="QString" name="legend/label-0"/>
-                  <Option value="To 10KM Start (07:30)" type="QString" name="legend/label-1"/>
-                  <Option value="To 5KM Start (08:30)" type="QString" name="legend/label-2"/>
-                  <Option value="hidden" type="QString" name="legend/title-style"/>
+                  <Option type="QString" value="To 21KM Start (06:30)" name="legend/label-0"/>
+                  <Option type="QString" value="To 10KM Start (07:30)" name="legend/label-1"/>
+                  <Option type="QString" value="To 5KM Start (08:30)" name="legend/label-2"/>
+                  <Option type="QString" value="hidden" name="legend/title-style"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -30926,47 +31016,47 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" valign="32" groupUuid="" position="221.862,190.027,mm" positionLock="false" templateUuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" uuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" type="65641" blendMode="0" size="27.7839,6.871,mm" opacity="1" visibility="1" htmlState="0" referencePoint="0" marginX="1" id="" halign="2" frame="false" zValue="5" labelText="REVISION 1.0" frameJoinStyle="miter" positionOnPage="221.862,190.027,mm" background="false" marginY="1" excludeFromExports="0" itemRotation="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem marginY="1" referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" htmlState="0" groupUuid="" positionOnPage="221.862,190.027,mm" positionLock="false" frameJoinStyle="miter" frame="false" type="65641" outlineWidthM="0.3,mm" templateUuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" background="false" size="27.7839,6.871,mm" labelText="REVISION 1.0" zValue="5" uuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" opacity="1" position="221.862,190.027,mm" marginX="1" halign="2" valign="32" excludeFromExports="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="50" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="1" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="12" namedStyle="" forcedItalic="0" fontSizeUnit="Point" allowHtml="0">
+        <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="" fontUnderline="0" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" fontWeight="50" fontStrikeout="0" fontItalic="0" fontSize="12" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferNoFill="1" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="1.5"/>
-          <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeBorderWidth="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <text-buffer bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
+            <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -30981,65 +31071,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" valign="64" groupUuid="" position="197.975,197.498,mm" positionLock="false" templateUuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" uuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" type="65641" blendMode="0" size="51.6706,6.60801,mm" opacity="1" visibility="1" htmlState="0" referencePoint="0" marginX="1" id="" halign="2" frame="false" zValue="4" labelText="Sunday, 20 October 2019" frameJoinStyle="miter" positionOnPage="197.975,197.498,mm" background="false" marginY="1" excludeFromExports="0" itemRotation="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem marginY="1" referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" htmlState="0" groupUuid="" positionOnPage="197.975,197.498,mm" positionLock="false" frameJoinStyle="miter" frame="false" type="65641" outlineWidthM="0.3,mm" templateUuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" background="false" size="51.6706,6.60801,mm" labelText="Sunday, 20 October 2019" zValue="4" uuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" opacity="1" position="197.975,197.498,mm" marginX="1" halign="2" valign="64" excludeFromExports="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="50" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="1" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="12" namedStyle="" forcedItalic="0" fontSizeUnit="Point" allowHtml="0">
+        <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="" fontUnderline="0" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" fontWeight="50" fontStrikeout="0" fontItalic="0" fontSize="12" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferNoFill="1" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="1.5"/>
-          <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeBorderWidth="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <text-buffer bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
+            <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -31054,39 +31144,39 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" groupUuid="" position="249.646,179.724,mm" anchorPoint="4" positionLock="false" svgFillColor="255,255,255,255" templateUuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" uuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" type="65640" blendMode="0" size="42.9838,24.3824,mm" opacity="1" visibility="1" svgBorderColor="0,0,0,255" northMode="0" northOffset="0" referencePoint="0" id="" frame="false" zValue="3" mode="1" frameJoinStyle="miter" resizeMode="0" positionOnPage="249.646,179.724,mm" file="../Gun_Run_Logo.png" svgBorderWidth="0.2" pictureRotation="0" background="false" pictureHeight="24.3824" pictureWidth="24.2337" excludeFromExports="0" itemRotation="0" mapUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" mapUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" svgBorderWidth="0.2" pictureHeight="24.3824" groupUuid="" positionOnPage="249.646,179.724,mm" positionLock="false" frameJoinStyle="miter" mode="1" frame="false" type="65640" outlineWidthM="0.3,mm" resizeMode="0" file="../Gun_Run_Logo.png" northOffset="0" templateUuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" background="false" svgFillColor="255,255,255,255" pictureRotation="0" size="42.9838,24.3824,mm" zValue="3" uuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" svgBorderColor="0,0,0,255" northMode="0" opacity="1" position="249.646,179.724,mm" excludeFromExports="0" pictureWidth="24.2337" anchorPoint="4">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedSource">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -31094,42 +31184,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" groupUuid="" position="4.58449,197.248,mm" positionLock="false" templateUuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" uuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" type="65643" blendMode="0" size="244.912,0.1,mm" opacity="1" visibility="1" referencePoint="0" id="" frame="false" zValue="2" shapeType="1" cornerRadiusMeasure="0,mm" frameJoinStyle="miter" positionOnPage="4.58449,197.248,mm" background="false" excludeFromExports="0" itemRotation="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" groupUuid="" positionOnPage="4.58449,197.248,mm" positionLock="false" frameJoinStyle="miter" frame="false" type="65643" outlineWidthM="0.3,mm" shapeType="1" cornerRadiusMeasure="0,mm" templateUuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" background="false" size="244.912,0.1,mm" zValue="2" uuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" opacity="1" position="4.58449,197.248,mm" excludeFromExports="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+        <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="0,0,0,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="solid" type="QString" name="outline_style"/>
-              <Option value="0.3" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+              <Option type="QString" value="0,0,0,255" name="color"/>
+              <Option type="QString" value="miter" name="joinstyle"/>
+              <Option type="QString" value="0,0" name="offset"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+              <Option type="QString" value="MM" name="offset_unit"/>
+              <Option type="QString" value="0,0,0,255" name="outline_color"/>
+              <Option type="QString" value="solid" name="outline_style"/>
+              <Option type="QString" value="0.3" name="outline_width"/>
+              <Option type="QString" value="MM" name="outline_width_unit"/>
+              <Option type="QString" value="solid" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="0,0,0,255"/>
@@ -31144,46 +31234,46 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" groupUuid="" position="4.43449,6.411,mm" positionLock="false" templateUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" type="65639" blendMode="0" followPresetName="Ask Me" keepLayerSet="false" size="288.007,183.616,mm" opacity="1" visibility="1" referencePoint="0" id="" frame="false" followPreset="true" zValue="1" frameJoinStyle="miter" labelMargin="0,mm" positionOnPage="4.43449,6.411,mm" mapRotation="0" background="true" excludeFromExports="0" itemRotation="0" drawCanvasItems="false" mapFlags="0" isTemporal="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" drawCanvasItems="false" mapRotation="0" mapFlags="0" groupUuid="" positionOnPage="4.43449,6.411,mm" positionLock="false" frameJoinStyle="miter" followPresetName="Ask Me" frame="false" type="65639" outlineWidthM="0.3,mm" labelMargin="0,mm" templateUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" background="true" size="288.007,183.616,mm" zValue="1" uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" opacity="1" position="4.43449,6.411,mm" keepLayerSet="false" excludeFromExports="0" isTemporal="0" followPreset="true">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedMapScale">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="1" type="int" name="type"/>
-                  <Option value="" type="QString" name="val"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="int" value="1" name="type"/>
+                  <Option type="QString" value="" name="val"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapXMin">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="1" type="int" name="type"/>
-                  <Option value="" type="QString" name="val"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="int" value="1" name="type"/>
+                  <Option type="QString" value="" name="val"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapYMin">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="1" type="int" name="type"/>
-                  <Option value="" type="QString" name="val"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="int" value="1" name="type"/>
+                  <Option type="QString" value="" name="val"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.39762336729721071" ymax="-33.8970204297764468" ymin="-33.90994364588821952" xmax="18.41789384089274151"/>
+        <Extent ymax="-33.8970204297764468" xmin="18.39762336729721071" ymin="-33.90994364588821952" xmax="18.41789384089274151"/>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
             <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
@@ -31198,45 +31288,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid show="0" rotatedTicksEnabled="0" gridFrameStyle="0" crossLength="3" gridFrameMargin="0" leftFrameDivisions="0" bottomFrameDivisions="0" gridFramePenThickness="0.5" topAnnotationDisplay="0" topAnnotationPosition="1" rotatedTicksMinimumAngle="0" name="Grid 1" showAnnotation="0" rotatedAnnotationsEnabled="0" rotatedTicksLengthMode="0" annotationExpression="" intervalX="0" bottomAnnotationPosition="1" rightAnnotationDisplay="0" rotatedAnnotationsMinimumAngle="0" annotationPrecision="3" frameFillColor1="255,255,255,255" blendMode="0" offsetY="0" gridFrameWidth="2" leftAnnotationDisplay="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" rotatedAnnotationsMarginToCorner="0" topFrameDivisions="0" topAnnotationDirection="0" rightAnnotationPosition="1" rotatedTicksMarginToCorner="0" gridStyle="0" minimumIntervalWidth="50" intervalY="0" unit="0" maximumIntervalWidth="100" gridFrameSideFlags="15" frameAnnotationDistance="1" frameFillColor2="0,0,0,255" rightAnnotationDirection="0" position="3" bottomAnnotationDisplay="0" leftAnnotationPosition="1" rotatedAnnotationsLengthMode="0" annotationFormat="0" gridFramePenColor="0,0,0,255" leftAnnotationDirection="0" rightFrameDivisions="0" bottomAnnotationDirection="0" offsetX="0">
+        <ComposerMapGrid bottomAnnotationPosition="1" frameFillColor2="0,0,0,255" blendMode="0" bottomAnnotationDisplay="0" name="Grid 1" frameFillColor1="255,255,255,255" position="3" bottomFrameDivisions="0" topAnnotationPosition="1" crossLength="3" leftAnnotationDisplay="0" intervalY="0" rotatedAnnotationsMarginToCorner="0" gridFrameStyle="0" annotationFormat="0" topAnnotationDirection="0" leftFrameDivisions="0" topFrameDivisions="0" annotationPrecision="3" rotatedTicksMinimumAngle="0" rightFrameDivisions="0" maximumIntervalWidth="100" unit="0" rotatedTicksEnabled="0" topAnnotationDisplay="0" leftAnnotationPosition="1" show="0" rotatedTicksMarginToCorner="0" rotatedTicksLengthMode="0" gridStyle="0" rotatedAnnotationsMinimumAngle="0" minimumIntervalWidth="50" bottomAnnotationDirection="0" annotationExpression="" intervalX="0" offsetY="0" offsetX="0" gridFramePenColor="0,0,0,255" gridFrameMargin="0" gridFrameWidth="2" rightAnnotationDisplay="0" rotatedAnnotationsEnabled="0" leftAnnotationDirection="0" rightAnnotationDirection="0" gridFrameSideFlags="15" gridFramePenThickness="0.5" showAnnotation="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" rightAnnotationPosition="1" frameAnnotationDistance="1" rotatedAnnotationsLengthMode="0">
           <lineStyle>
-            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0,0,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0,0,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -31267,44 +31357,44 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+              <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="angle"/>
-                  <Option value="square" type="QString" name="cap_style"/>
-                  <Option value="0,0,0,255" type="QString" name="color"/>
-                  <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="circle" type="QString" name="name"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                  <Option value="solid" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="diameter" type="QString" name="scale_method"/>
-                  <Option value="2" type="QString" name="size"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="size_unit"/>
-                  <Option value="1" type="QString" name="vertical_anchor_point"/>
+                  <Option type="QString" value="0" name="angle"/>
+                  <Option type="QString" value="square" name="cap_style"/>
+                  <Option type="QString" value="0,0,0,255" name="color"/>
+                  <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="circle" name="name"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                  <Option type="QString" value="solid" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="diameter" name="scale_method"/>
+                  <Option type="QString" value="2" name="size"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="size_unit"/>
+                  <Option type="QString" value="1" name="vertical_anchor_point"/>
                 </Option>
                 <prop k="angle" v="0"/>
                 <prop k="cap_style" v="square"/>
@@ -31327,40 +31417,40 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="50" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="1" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="10" namedStyle="" forcedItalic="0" fontSizeUnit="Point" allowHtml="0">
+          <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="" fontUnderline="0" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" fontWeight="50" fontStrikeout="0" fontItalic="0" fontSize="10" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" textOrientation="horizontal">
             <families/>
-            <text-buffer bufferNoFill="1" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="1.5"/>
-            <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeBorderWidth="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-              <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <text-buffer bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+            <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskType="0"/>
+            <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
+              <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                    <Option value="255,255,255,255" type="QString" name="color"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                    <Option value="no" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="solid" type="QString" name="style"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                    <Option type="QString" value="255,255,255,255" name="color"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                    <Option type="QString" value="no" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="solid" name="style"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -31375,29 +31465,29 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+            <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -31405,56 +31495,56 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
+        <AtlasMap margin="0.10000000000000001" scalingMode="2" atlasDriven="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" enabled="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clipSource="" enabled="0" clippingType="0"/>
+        <itemClippingSettings clipSource="" forceLabelsInside="0" clippingType="0" enabled="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" type="QString" name="atlasRasterFormat"/>
-          <Option value="0" type="QString" name="forceVector"/>
-          <Option value="true" type="QString" name="imageAntialias"/>
-          <Option value="0" type="QString" name="imageCropMarginBottom"/>
-          <Option value="0" type="QString" name="imageCropMarginLeft"/>
-          <Option value="0" type="QString" name="imageCropMarginRight"/>
-          <Option value="0" type="QString" name="imageCropMarginTop"/>
-          <Option value="false" type="QString" name="imageCropToContents"/>
-          <Option value="0" type="QString" name="pdfDisableRasterTiles"/>
-          <Option value="1" type="QString" name="pdfIncludeMetadata"/>
-          <Option value="0" type="QString" name="pdfTextFormat"/>
-          <Option value="true" type="QString" name="singleFile"/>
+          <Option type="QString" value="png" name="atlasRasterFormat"/>
+          <Option type="QString" value="0" name="forceVector"/>
+          <Option type="QString" value="true" name="imageAntialias"/>
+          <Option type="QString" value="0" name="imageCropMarginBottom"/>
+          <Option type="QString" value="0" name="imageCropMarginLeft"/>
+          <Option type="QString" value="0" name="imageCropMarginRight"/>
+          <Option type="QString" value="0" name="imageCropMarginTop"/>
+          <Option type="QString" value="false" name="imageCropToContents"/>
+          <Option type="QString" value="0" name="pdfDisableRasterTiles"/>
+          <Option type="QString" value="1" name="pdfIncludeMetadata"/>
+          <Option type="QString" value="0" name="pdfTextFormat"/>
+          <Option type="QString" value="true" name="singleFile"/>
         </Option>
       </customproperties>
-      <Atlas hideCoverage="0" pageNameExpression="" sortFeatures="0" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - '||&quot;RouteLen&quot;||'KM rev '" filterFeatures="0" coverageLayer="" enabled="0"/>
+      <Atlas filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - '||&quot;RouteLen&quot;||'KM rev '" coverageLayer="" filterFeatures="0" hideCoverage="0" enabled="0" pageNameExpression="" sortFeatures="0"/>
     </Layout>
-    <Layout name="Routes" printResolution="144" worldFileMap="" units="mm">
-      <Snapper snapToItems="1" snapToGuides="1" tolerance="5" snapToGrid="0"/>
-      <Grid resUnits="mm" offsetUnits="mm" offsetY="0" offsetX="0" resolution="10"/>
+    <Layout units="mm" printResolution="144" worldFileMap="" name="Routes">
+      <Snapper snapToGuides="1" tolerance="5" snapToGrid="0" snapToItems="1"/>
+      <Grid resolution="10" offsetY="0" offsetX="0" offsetUnits="mm" resUnits="mm"/>
       <PageCollection>
-        <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+        <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="255,255,255,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="no" type="QString" name="outline_style"/>
-              <Option value="0.26" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+              <Option type="QString" value="255,255,255,255" name="color"/>
+              <Option type="QString" value="miter" name="joinstyle"/>
+              <Option type="QString" value="0,0" name="offset"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+              <Option type="QString" value="MM" name="offset_unit"/>
+              <Option type="QString" value="0,0,0,255" name="outline_color"/>
+              <Option type="QString" value="no" name="outline_style"/>
+              <Option type="QString" value="0.26" name="outline_width"/>
+              <Option type="QString" value="MM" name="outline_width_unit"/>
+              <Option type="QString" value="solid" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
@@ -31469,49 +31559,49 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem outlineWidthM="0.3,mm" groupUuid="" position="0,0,mm" positionLock="false" templateUuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" uuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" type="65638" blendMode="0" size="297,210,mm" opacity="1" visibility="1" referencePoint="0" id="" frame="false" zValue="0" frameJoinStyle="miter" positionOnPage="0,0,mm" background="true" excludeFromExports="0" itemRotation="0">
-          <FrameColor red="0" green="0" blue="0" alpha="255"/>
-          <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+        <LayoutItem referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" groupUuid="" positionOnPage="0,0,mm" positionLock="false" frameJoinStyle="miter" frame="false" type="65638" outlineWidthM="0.3,mm" templateUuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" background="true" size="297,210,mm" zValue="0" uuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" opacity="1" position="0,0,mm" excludeFromExports="0">
+          <FrameColor alpha="255" red="0" blue="0" green="0"/>
+          <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="255,255,255,255" type="QString" name="color"/>
-                <Option value="miter" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="255,255,255,255" name="color"/>
+                <Option type="QString" value="miter" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                <Option type="QString" value="no" name="outline_style"/>
+                <Option type="QString" value="0.26" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -31526,59 +31616,59 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide position="0" page="0" orientation="2" units="mm"/>
+          <Guide page="0" units="mm" orientation="2" position="0"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem outlineWidthM="0.3,mm" valign="64" groupUuid="" position="200.171,199.082,mm" positionLock="true" templateUuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" uuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" type="65641" blendMode="0" size="61.5373,6.8714,mm" opacity="1" visibility="1" htmlState="0" referencePoint="0" marginX="1" id="" halign="2" frame="false" zValue="13" labelText="REVISION 3" frameJoinStyle="miter" positionOnPage="200.171,199.082,mm" background="false" marginY="1" excludeFromExports="0" itemRotation="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem marginY="0" referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" htmlState="0" groupUuid="" positionOnPage="200.171,199.082,mm" positionLock="true" frameJoinStyle="miter" frame="false" type="65641" outlineWidthM="0.3,mm" templateUuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" background="false" size="61.5373,6.8714,mm" labelText="REVISION 3.1" zValue="13" uuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" opacity="1" position="200.171,199.082,mm" marginX="0" halign="2" valign="32" excludeFromExports="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="50" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="1" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="12" namedStyle="" forcedItalic="0" fontSizeUnit="Point" allowHtml="0">
+        <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="" fontUnderline="0" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" fontWeight="50" fontStrikeout="0" fontItalic="0" fontSize="12" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferNoFill="1" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="1.5"/>
-          <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeBorderWidth="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <text-buffer bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
+            <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -31593,65 +31683,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" valign="64" groupUuid="" position="9.7863,192.073,mm" positionLock="true" templateUuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" uuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" type="65641" blendMode="0" size="61.5373,6.60801,mm" opacity="1" visibility="1" htmlState="0" referencePoint="0" marginX="1" id="" halign="1" frame="false" zValue="12" labelText="Gun Run 2022: [%&quot;Source&quot;%]" frameJoinStyle="miter" positionOnPage="9.7863,192.073,mm" background="false" marginY="1" excludeFromExports="0" itemRotation="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem marginY="0" referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" htmlState="0" groupUuid="" positionOnPage="9.7863,192.073,mm" positionLock="true" frameJoinStyle="miter" frame="false" type="65641" outlineWidthM="0.3,mm" templateUuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" background="false" size="61.5373,6.60801,mm" labelText="Gun Run 2022: [%&quot;Source&quot;%]" zValue="12" uuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" opacity="1" position="9.7863,192.073,mm" marginX="0" halign="1" valign="64" excludeFromExports="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="50" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="1" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="12" namedStyle="" forcedItalic="0" fontSizeUnit="Point" allowHtml="0">
+        <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="" fontUnderline="0" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" fontWeight="50" fontStrikeout="0" fontItalic="0" fontSize="12" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferNoFill="1" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="1.5"/>
-          <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeBorderWidth="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <text-buffer bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
+            <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -31666,65 +31756,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" valign="64" groupUuid="" position="9.7863,199.082,mm" positionLock="true" templateUuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" uuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" type="65641" blendMode="0" size="61.5373,6.60801,mm" opacity="1" visibility="1" htmlState="0" referencePoint="0" marginX="1" id="" halign="1" frame="false" zValue="11" labelText="[% if( regexp_match( &quot;Source&quot;, '^(5|Trail)' ),&#xa; 'Saturday, 17 September 2022',&#xa; 'Sunday, 18 September 2022'&#xa;)%]" frameJoinStyle="miter" positionOnPage="9.7863,199.082,mm" background="false" marginY="1" excludeFromExports="0" itemRotation="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem marginY="0" referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" htmlState="0" groupUuid="" positionOnPage="9.7863,199.082,mm" positionLock="true" frameJoinStyle="miter" frame="false" type="65641" outlineWidthM="0.3,mm" templateUuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" background="false" size="61.5373,6.60801,mm" labelText="[% if( regexp_match( &quot;Source&quot;, '^(5|Trail)' ),&#xa; 'Saturday, 17 September 2022',&#xa; 'Sunday, 18 September 2022'&#xa;)%]" zValue="11" uuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" opacity="1" position="9.7863,199.082,mm" marginX="0" halign="1" valign="32" excludeFromExports="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="50" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="1" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="12" namedStyle="" forcedItalic="0" fontSizeUnit="Point" allowHtml="0">
+        <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="" fontUnderline="0" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" fontWeight="50" fontStrikeout="0" fontItalic="0" fontSize="12" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferNoFill="1" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="1.5"/>
-          <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeBorderWidth="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <text-buffer bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
+            <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -31739,39 +31829,39 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" groupUuid="" position="262.196,188.218,mm" anchorPoint="4" positionLock="true" svgFillColor="255,255,255,255" templateUuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" uuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" type="65640" blendMode="0" size="29.7523,17.4718,mm" opacity="1" visibility="1" svgBorderColor="0,0,0,255" northMode="0" northOffset="0" referencePoint="0" id="" frame="false" zValue="10" mode="1" frameJoinStyle="miter" resizeMode="0" positionOnPage="262.196,188.218,mm" file="../GunRun2022_250.png" svgBorderWidth="0.2" pictureRotation="0" background="false" pictureHeight="15.9472" pictureWidth="29.7523" excludeFromExports="0" itemRotation="0" mapUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" mapUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" svgBorderWidth="0.2" pictureHeight="15.9472" groupUuid="" positionOnPage="262.196,188.218,mm" positionLock="true" frameJoinStyle="miter" mode="1" frame="false" type="65640" outlineWidthM="0.3,mm" resizeMode="0" file="../GunRun2022_250.png" northOffset="0" templateUuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" background="false" svgFillColor="255,255,255,255" pictureRotation="0" size="29.7523,17.4718,mm" zValue="10" uuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" svgBorderColor="0,0,0,255" northMode="0" opacity="1" position="262.196,188.218,mm" excludeFromExports="0" pictureWidth="29.7523" anchorPoint="4">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedSource">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -31779,42 +31869,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" groupUuid="" position="9.57644,198.832,mm" positionLock="true" templateUuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" uuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" type="65643" blendMode="0" size="251.982,0.1,mm" opacity="1" visibility="1" referencePoint="0" id="" frame="false" zValue="9" shapeType="1" cornerRadiusMeasure="0,mm" frameJoinStyle="miter" positionOnPage="9.57644,198.832,mm" background="false" excludeFromExports="0" itemRotation="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" groupUuid="" positionOnPage="9.57644,198.832,mm" positionLock="true" frameJoinStyle="miter" frame="false" type="65643" outlineWidthM="0.3,mm" shapeType="1" cornerRadiusMeasure="0,mm" templateUuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" background="false" size="251.982,0.1,mm" zValue="9" uuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" opacity="1" position="9.57644,198.832,mm" excludeFromExports="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+        <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="0,0,0,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="solid" type="QString" name="outline_style"/>
-              <Option value="0.3" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+              <Option type="QString" value="0,0,0,255" name="color"/>
+              <Option type="QString" value="miter" name="joinstyle"/>
+              <Option type="QString" value="0,0" name="offset"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+              <Option type="QString" value="MM" name="offset_unit"/>
+              <Option type="QString" value="0,0,0,255" name="outline_color"/>
+              <Option type="QString" value="solid" name="outline_style"/>
+              <Option type="QString" value="0.3" name="outline_width"/>
+              <Option type="QString" value="MM" name="outline_width_unit"/>
+              <Option type="QString" value="solid" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="0,0,0,255"/>
@@ -31829,321 +31919,321 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" groupUuid="" position="9.57644,5.42566,mm" positionLock="true" templateUuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" uuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" type="65639" blendMode="0" followPresetName="Routes" keepLayerSet="false" size="107.861,186.385,mm" opacity="1" visibility="1" referencePoint="0" id="Trail Finish" frame="true" followPreset="true" zValue="8" frameJoinStyle="miter" labelMargin="0,mm" positionOnPage="9.57644,5.42566,mm" mapRotation="0" background="true" excludeFromExports="0" itemRotation="0" drawCanvasItems="true" mapFlags="0" isTemporal="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem referencePoint="0" blendMode="0" itemRotation="0" id="Trail Finish" visibility="1" drawCanvasItems="true" mapRotation="0" mapFlags="0" groupUuid="" positionOnPage="9.57644,5.42566,mm" positionLock="true" frameJoinStyle="miter" followPresetName="Routes" frame="true" type="65639" outlineWidthM="0.3,mm" labelMargin="0,mm" templateUuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" background="true" size="107.861,186.385,mm" zValue="8" uuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" opacity="1" position="9.57644,5.42566,mm" keepLayerSet="false" excludeFromExports="0" isTemporal="0" followPreset="true">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedOpacity">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.39314911415855391" ymax="-33.90007566747966905" ymin="-33.93243205975926458" xmax="18.41187375074135701"/>
+        <Extent ymax="-33.90007566747966905" xmin="18.39314911415855391" ymin="-33.93243205975926458" xmax="18.41187375074135701"/>
         <LayerSet/>
-        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
+        <AtlasMap margin="0.10000000000000001" scalingMode="2" atlasDriven="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="1">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="1" enabled="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clipSource="" enabled="0" clippingType="1"/>
+        <itemClippingSettings clipSource="" forceLabelsInside="0" clippingType="1" enabled="0"/>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" groupUuid="" position="112.643,4.09761,mm" positionLock="true" templateUuid="{01af805d-ea17-430b-b08a-fc3789925456}" uuid="{01af805d-ea17-430b-b08a-fc3789925456}" type="65639" blendMode="0" followPresetName="Routes" keepLayerSet="false" size="179.156,189.279,mm" opacity="1" visibility="1" referencePoint="0" id="Trail Start" frame="true" followPreset="true" zValue="7" frameJoinStyle="miter" labelMargin="0,mm" positionOnPage="112.643,4.09761,mm" mapRotation="0" background="true" excludeFromExports="0" itemRotation="0" drawCanvasItems="true" mapFlags="0" isTemporal="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem referencePoint="0" blendMode="0" itemRotation="0" id="Trail Start" visibility="1" drawCanvasItems="true" mapRotation="0" mapFlags="0" groupUuid="" positionOnPage="112.643,4.09761,mm" positionLock="true" frameJoinStyle="miter" followPresetName="Routes" frame="true" type="65639" outlineWidthM="0.3,mm" labelMargin="0,mm" templateUuid="{01af805d-ea17-430b-b08a-fc3789925456}" background="true" size="179.156,189.279,mm" zValue="7" uuid="{01af805d-ea17-430b-b08a-fc3789925456}" opacity="1" position="112.643,4.09761,mm" keepLayerSet="false" excludeFromExports="0" isTemporal="0" followPreset="true">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedOpacity">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.3924263991010406" ymax="-33.92484901666441743" ymin="-33.95772328900195447" xmax="18.42354248737832023"/>
+        <Extent ymax="-33.92484901666441743" xmin="18.3924263991010406" ymin="-33.95772328900195447" xmax="18.42354248737832023"/>
         <LayerSet/>
-        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
+        <AtlasMap margin="0.10000000000000001" scalingMode="2" atlasDriven="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="1">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="1" enabled="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clipSource="" enabled="0" clippingType="1"/>
+        <itemClippingSettings clipSource="" forceLabelsInside="0" clippingType="1" enabled="0"/>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" groupUuid="" position="5.86559,4.09761,mm" positionLock="true" templateUuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" uuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" type="65639" blendMode="0" followPresetName="Routes" keepLayerSet="false" size="67.7828,166.874,mm" opacity="1" visibility="1" referencePoint="0" id="Left inset 21KM" frame="true" followPreset="true" zValue="6" frameJoinStyle="miter" labelMargin="0,mm" positionOnPage="5.86559,4.09761,mm" mapRotation="0" background="true" excludeFromExports="0" itemRotation="0" drawCanvasItems="false" mapFlags="0" isTemporal="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem referencePoint="0" blendMode="0" itemRotation="0" id="Left inset 21KM" visibility="1" drawCanvasItems="false" mapRotation="0" mapFlags="0" groupUuid="" positionOnPage="5.86559,4.09761,mm" positionLock="true" frameJoinStyle="miter" followPresetName="Routes" frame="true" type="65639" outlineWidthM="0.3,mm" labelMargin="0,mm" templateUuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" background="true" size="67.7828,166.874,mm" zValue="6" uuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" opacity="1" position="5.86559,4.09761,mm" keepLayerSet="false" excludeFromExports="0" isTemporal="0" followPreset="true">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedMapScale">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '12500'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '12500'&#xa;END" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapXMax">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.424'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.419'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.417'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.424'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.419'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.417'&#xa;END" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapXMin">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.374'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.374'&#xa;END" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapYMax">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.893'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.897'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.898'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.893'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.897'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.898'&#xa;END" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapYMin">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.947'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.947'&#xa;END" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedOpacity">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="100.0 - (if( &quot;Source&quot; = '21KM', '0', '100' ))" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="100.0 - (if( &quot;Source&quot; = '21KM', '0', '100' ))" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.37399999999999878" ymax="-33.91681492292400435" ymin="-33.94700000000000273" xmax="18.38626092146919788"/>
+        <Extent ymax="-33.91681492292400435" xmin="18.37399999999999878" ymin="-33.94700000000000273" xmax="18.38626092146919788"/>
         <LayerSet/>
-        <AtlasMap margin="0.05" atlasDriven="0" scalingMode="2"/>
+        <AtlasMap margin="0.05" scalingMode="2" atlasDriven="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" enabled="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clipSource="" enabled="0" clippingType="0"/>
+        <itemClippingSettings clipSource="" forceLabelsInside="0" clippingType="0" enabled="0"/>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" groupUuid="" position="126.141,118.975,mm" positionLock="true" templateUuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" uuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" type="65639" blendMode="0" followPresetName="Routes" keepLayerSet="false" size="113.3,76.1023,mm" opacity="1" visibility="1" referencePoint="0" id="Bottom inset 21KM" frame="true" followPreset="true" zValue="5" frameJoinStyle="miter" labelMargin="0,mm" positionOnPage="126.141,118.975,mm" mapRotation="0" background="true" excludeFromExports="0" itemRotation="0" drawCanvasItems="true" mapFlags="0" isTemporal="0">
-        <FrameColor red="103" green="34" blue="144" alpha="255"/>
-        <BackgroundColor red="200" green="175" blue="215" alpha="255"/>
+      <LayoutItem referencePoint="0" blendMode="0" itemRotation="0" id="Bottom inset 21KM" visibility="1" drawCanvasItems="true" mapRotation="0" mapFlags="0" groupUuid="" positionOnPage="133.191,119.125,mm" positionLock="true" frameJoinStyle="miter" followPresetName="Routes" frame="true" type="65639" outlineWidthM="0.3,mm" labelMargin="0,mm" templateUuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" background="true" size="113.3,76.1023,mm" zValue="5" uuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" opacity="1" position="133.191,119.125,mm" keepLayerSet="false" excludeFromExports="0" isTemporal="0" followPreset="true">
+        <FrameColor alpha="255" red="103" blue="144" green="34"/>
+        <BackgroundColor alpha="255" red="200" blue="215" green="175"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedOpacity">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="100.0 - (if( &quot;Source&quot; = '21KM', '0', '100' ))" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="100.0 - (if( &quot;Source&quot; = '21KM', '0', '100' ))" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.41509620662891678" ymax="-33.91132718340826813" ymin="-33.9168317482614512" xmax="18.42329132157224336"/>
+        <Extent ymax="-33.91132718340826813" xmin="18.41509620662891678" ymin="-33.9168317482614512" xmax="18.42329132157224336"/>
         <LayerSet/>
-        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="0"/>
+        <AtlasMap margin="0.10000000000000001" scalingMode="0" atlasDriven="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="1">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="1" enabled="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clipSource="" enabled="0" clippingType="1"/>
+        <itemClippingSettings clipSource="" forceLabelsInside="0" clippingType="1" enabled="0"/>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" groupUuid="" position="19.6693,7.89412,mm" positionLock="true" templateUuid="{049d9e83-6801-4e4c-b598-d6a49a1d9d81}" uuid="{049d9e83-6801-4e4c-b598-d6a49a1d9d81}" type="65639" blendMode="0" followPresetName="Routes" keepLayerSet="false" size="68.3676,117.12,mm" opacity="1" visibility="0" referencePoint="0" id="End inset Trail" frame="true" followPreset="true" zValue="4" frameJoinStyle="miter" labelMargin="0,mm" positionOnPage="19.6693,7.89412,mm" mapRotation="0" background="true" excludeFromExports="0" itemRotation="0" drawCanvasItems="true" mapFlags="0" isTemporal="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem referencePoint="0" blendMode="0" itemRotation="0" id="End inset Trail" visibility="0" drawCanvasItems="true" mapRotation="0" mapFlags="0" groupUuid="" positionOnPage="19.6693,7.89412,mm" positionLock="true" frameJoinStyle="miter" followPresetName="Routes" frame="true" type="65639" outlineWidthM="0.3,mm" labelMargin="0,mm" templateUuid="{049d9e83-6801-4e4c-b598-d6a49a1d9d81}" background="true" size="68.3676,117.12,mm" zValue="4" uuid="{049d9e83-6801-4e4c-b598-d6a49a1d9d81}" opacity="1" position="19.6693,7.89412,mm" keepLayerSet="false" excludeFromExports="0" isTemporal="0" followPreset="true">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedOpacity">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.4044900556177744" ymax="-33.90099106513847005" ymin="-33.91454383501641701" xmax="18.41240136424316276"/>
+        <Extent ymax="-33.90099106513847005" xmin="18.4044900556177744" ymin="-33.91454383501641701" xmax="18.41240136424316276"/>
         <LayerSet/>
-        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
+        <AtlasMap margin="0.10000000000000001" scalingMode="2" atlasDriven="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="1">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="1" enabled="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clipSource="" enabled="0" clippingType="1"/>
+        <itemClippingSettings clipSource="" forceLabelsInside="0" clippingType="1" enabled="0"/>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" groupUuid="" position="170.062,49.6297,mm" positionLock="true" templateUuid="{e02b974b-51c7-4d24-8314-a65c125ff5d1}" uuid="{e02b974b-51c7-4d24-8314-a65c125ff5d1}" type="65639" blendMode="0" followPresetName="Routes" keepLayerSet="false" size="63.655,88.3012,mm" opacity="1" visibility="0" referencePoint="0" id="Start inset Trail" frame="true" followPreset="true" zValue="3" frameJoinStyle="miter" labelMargin="0,mm" positionOnPage="170.062,49.6297,mm" mapRotation="0" background="true" excludeFromExports="0" itemRotation="0" drawCanvasItems="true" mapFlags="0" isTemporal="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem referencePoint="0" blendMode="0" itemRotation="0" id="Start inset Trail" visibility="0" drawCanvasItems="true" mapRotation="0" mapFlags="0" groupUuid="" positionOnPage="170.062,49.6297,mm" positionLock="true" frameJoinStyle="miter" followPresetName="Routes" frame="true" type="65639" outlineWidthM="0.3,mm" labelMargin="0,mm" templateUuid="{e02b974b-51c7-4d24-8314-a65c125ff5d1}" background="true" size="63.655,88.3012,mm" zValue="3" uuid="{e02b974b-51c7-4d24-8314-a65c125ff5d1}" opacity="1" position="170.062,49.6297,mm" keepLayerSet="false" excludeFromExports="0" isTemporal="0" followPreset="true">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedOpacity">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.41445559427620893" ymax="-33.94253141264477591" ymin="-33.94823764719958348" xmax="18.4185691326545431"/>
+        <Extent ymax="-33.94253141264477591" xmin="18.41445559427620893" ymin="-33.94823764719958348" xmax="18.4185691326545431"/>
         <LayerSet/>
-        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
+        <AtlasMap margin="0.10000000000000001" scalingMode="2" atlasDriven="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="1">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="1" enabled="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clipSource="" enabled="0" clippingType="1"/>
+        <itemClippingSettings clipSource="" forceLabelsInside="0" clippingType="1" enabled="0"/>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" groupUuid="" position="200.321,125.314,mm" positionLock="true" templateUuid="{917a530c-14f4-4ed8-b109-961939435221}" uuid="{917a530c-14f4-4ed8-b109-961939435221}" type="65639" blendMode="0" followPresetName="Routes" keepLayerSet="false" size="75.8756,69.7635,mm" opacity="1" visibility="0" referencePoint="0" id="Contour inset Trail" frame="true" followPreset="true" zValue="2" frameJoinStyle="miter" labelMargin="0,mm" positionOnPage="200.321,125.314,mm" mapRotation="0" background="true" excludeFromExports="0" itemRotation="0" drawCanvasItems="true" mapFlags="0" isTemporal="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem referencePoint="0" blendMode="0" itemRotation="0" id="Contour inset Trail" visibility="0" drawCanvasItems="true" mapRotation="0" mapFlags="0" groupUuid="" positionOnPage="200.321,125.314,mm" positionLock="true" frameJoinStyle="miter" followPresetName="Routes" frame="true" type="65639" outlineWidthM="0.3,mm" labelMargin="0,mm" templateUuid="{917a530c-14f4-4ed8-b109-961939435221}" background="true" size="75.8756,69.7635,mm" zValue="2" uuid="{917a530c-14f4-4ed8-b109-961939435221}" opacity="1" position="200.321,125.314,mm" keepLayerSet="false" excludeFromExports="0" isTemporal="0" followPreset="true">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedOpacity">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.41234259163472942" ymax="-33.94692690566557047" ymin="-33.95702588572736147" xmax="18.42332635419156972"/>
+        <Extent ymax="-33.94692690566557047" xmin="18.41234259163472942" ymin="-33.95702588572736147" xmax="18.42332635419156972"/>
         <LayerSet/>
-        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
+        <AtlasMap margin="0.10000000000000001" scalingMode="2" atlasDriven="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="1">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="1" enabled="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clipSource="" enabled="0" clippingType="1"/>
+        <itemClippingSettings clipSource="" forceLabelsInside="0" clippingType="1" enabled="0"/>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.15,mm" groupUuid="" position="9.50144,5.50066,mm" positionLock="true" templateUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" uuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" type="65639" blendMode="0" followPresetName="Routes" keepLayerSet="false" size="282.372,186.105,mm" opacity="1" visibility="1" referencePoint="0" id="Main Map" frame="true" followPreset="true" zValue="1" frameJoinStyle="round" labelMargin="0,mm" positionOnPage="9.50144,5.50066,mm" mapRotation="0" background="true" excludeFromExports="0" itemRotation="0" drawCanvasItems="true" mapFlags="0" isTemporal="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem referencePoint="0" blendMode="0" itemRotation="0" id="Main Map" visibility="1" drawCanvasItems="true" mapRotation="0" mapFlags="0" groupUuid="" positionOnPage="9.50144,5.50066,mm" positionLock="false" frameJoinStyle="round" followPresetName="Routes" frame="true" type="65639" outlineWidthM="0.15,mm" labelMargin="0,mm" templateUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" background="true" size="282.372,186.105,mm" zValue="1" uuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" opacity="1" position="9.50144,5.50066,mm" keepLayerSet="false" excludeFromExports="0" isTemporal="0" followPreset="true">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedMapScale">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '12500'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '9000'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '4500'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '22000'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '12500'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '9000'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '4500'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '22000'&#xa;END" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapXMin">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '18.372'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '18.381'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '18.393'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '18.364'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '18.372'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '18.380'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '18.393'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '18.364'&#xa;END" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapYMin">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '-33.926'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '-33.920'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '-33.911'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '-33.959'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '-33.926'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '-33.922'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '-33.911'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '-33.959'&#xa;END" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.36400000000000077" ymax="-33.89975491889535419" ymin="-33.95900000000000318" xmax="18.45389078066072486"/>
+        <Extent ymax="-33.89234816783005044" xmin="18.37199999999999989" ymin="-33.92600000000000193" xmax="18.42305891338173041"/>
         <LayerSet/>
-        <ComposerMapGrid show="0" rotatedTicksEnabled="0" gridFrameStyle="0" crossLength="3" gridFrameMargin="0" leftFrameDivisions="0" bottomFrameDivisions="0" gridFramePenThickness="0.5" topAnnotationDisplay="0" topAnnotationPosition="1" rotatedTicksMinimumAngle="0" name="Grid 1" showAnnotation="0" rotatedAnnotationsEnabled="0" rotatedTicksLengthMode="0" annotationExpression="" intervalX="0" bottomAnnotationPosition="1" rightAnnotationDisplay="0" rotatedAnnotationsMinimumAngle="0" annotationPrecision="3" frameFillColor1="255,255,255,255" blendMode="0" offsetY="0" gridFrameWidth="2" leftAnnotationDisplay="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" rotatedAnnotationsMarginToCorner="0" topFrameDivisions="0" topAnnotationDirection="0" rightAnnotationPosition="1" rotatedTicksMarginToCorner="0" gridStyle="0" minimumIntervalWidth="50" intervalY="0" unit="0" maximumIntervalWidth="100" gridFrameSideFlags="15" frameAnnotationDistance="1" frameFillColor2="0,0,0,255" rightAnnotationDirection="0" position="3" bottomAnnotationDisplay="0" leftAnnotationPosition="1" rotatedAnnotationsLengthMode="0" annotationFormat="0" gridFramePenColor="0,0,0,255" leftAnnotationDirection="0" rightFrameDivisions="0" bottomAnnotationDirection="0" offsetX="0">
+        <ComposerMapGrid bottomAnnotationPosition="1" frameFillColor2="0,0,0,255" blendMode="0" bottomAnnotationDisplay="0" name="Grid 1" frameFillColor1="255,255,255,255" position="3" bottomFrameDivisions="0" topAnnotationPosition="1" crossLength="3" leftAnnotationDisplay="0" intervalY="0" rotatedAnnotationsMarginToCorner="0" gridFrameStyle="0" annotationFormat="0" topAnnotationDirection="0" leftFrameDivisions="0" topFrameDivisions="0" annotationPrecision="3" rotatedTicksMinimumAngle="0" rightFrameDivisions="0" maximumIntervalWidth="100" unit="0" rotatedTicksEnabled="0" topAnnotationDisplay="0" leftAnnotationPosition="1" show="0" rotatedTicksMarginToCorner="0" rotatedTicksLengthMode="0" gridStyle="0" rotatedAnnotationsMinimumAngle="0" minimumIntervalWidth="50" bottomAnnotationDirection="0" annotationExpression="" intervalX="0" offsetY="0" offsetX="0" gridFramePenColor="0,0,0,255" gridFrameMargin="0" gridFrameWidth="2" rightAnnotationDisplay="0" rotatedAnnotationsEnabled="0" leftAnnotationDirection="0" rightAnnotationDirection="0" gridFrameSideFlags="15" gridFramePenThickness="0.5" showAnnotation="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" rightAnnotationPosition="1" frameAnnotationDistance="1" rotatedAnnotationsLengthMode="0">
           <lineStyle>
-            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0,0,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0,0,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -32174,44 +32264,44 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+              <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="angle"/>
-                  <Option value="square" type="QString" name="cap_style"/>
-                  <Option value="0,0,0,255" type="QString" name="color"/>
-                  <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="circle" type="QString" name="name"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                  <Option value="solid" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="diameter" type="QString" name="scale_method"/>
-                  <Option value="2" type="QString" name="size"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="size_unit"/>
-                  <Option value="1" type="QString" name="vertical_anchor_point"/>
+                  <Option type="QString" value="0" name="angle"/>
+                  <Option type="QString" value="square" name="cap_style"/>
+                  <Option type="QString" value="0,0,0,255" name="color"/>
+                  <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="circle" name="name"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                  <Option type="QString" value="solid" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="diameter" name="scale_method"/>
+                  <Option type="QString" value="2" name="size"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="size_unit"/>
+                  <Option type="QString" value="1" name="vertical_anchor_point"/>
                 </Option>
                 <prop k="angle" v="0"/>
                 <prop k="cap_style" v="square"/>
@@ -32234,40 +32324,40 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="50" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="1" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="10" namedStyle="" forcedItalic="0" fontSizeUnit="Point" allowHtml="0">
+          <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="" fontUnderline="0" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" fontWeight="50" fontStrikeout="0" fontItalic="0" fontSize="10" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" textOrientation="horizontal">
             <families/>
-            <text-buffer bufferNoFill="1" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="1.5"/>
-            <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeBorderWidth="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-              <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <text-buffer bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+            <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskType="0"/>
+            <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
+              <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                    <Option value="255,255,255,255" type="QString" name="color"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                    <Option value="no" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="solid" type="QString" name="style"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                    <Option type="QString" value="255,255,255,255" name="color"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                    <Option type="QString" value="no" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="solid" name="style"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -32282,29 +32372,29 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+            <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -32312,34 +32402,34 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <ComposerMapOverview inverted="0" centered="0" uuid="{e010b26c-eb3c-4800-b436-eead87b4cf37}" show="1" frameMap="{4228b319-f275-4a0b-ac13-4898f517cf3f}" position="3" blendMode="0" name="Overview 1">
-          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+        <ComposerMapOverview blendMode="0" inverted="0" frameMap="{4228b319-f275-4a0b-ac13-4898f517cf3f}" centered="0" position="3" uuid="{e010b26c-eb3c-4800-b436-eead87b4cf37}" show="1" name="Overview 1">
+          <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option type="Map" name="properties">
                   <Option type="Map" name="alpha">
-                    <Option value="true" type="bool" name="active"/>
-                    <Option value="100.0 - (if( &quot;RouteLen&quot; = '21', '0', '100' ))" type="QString" name="expression"/>
-                    <Option value="3" type="int" name="type"/>
+                    <Option type="bool" value="true" name="active"/>
+                    <Option type="QString" value="100.0 - (if( &quot;RouteLen&quot; = '21', '0', '100' ))" name="expression"/>
+                    <Option type="int" value="3" name="type"/>
                   </Option>
                 </Option>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="103,34,144,26" type="QString" name="color"/>
-                <Option value="bevel" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="103,34,144,255" type="QString" name="outline_color"/>
-                <Option value="solid" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="103,34,144,26" name="color"/>
+                <Option type="QString" value="bevel" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="103,34,144,255" name="outline_color"/>
+                <Option type="QString" value="solid" name="outline_style"/>
+                <Option type="QString" value="0.26" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="103,34,144,26"/>
@@ -32354,9 +32444,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -32364,9 +32454,9 @@ def my_form_open(dialog, layer, feature):
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -32374,63 +32464,63 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapOverview>
-        <AtlasMap margin="0.06" atlasDriven="0" scalingMode="2"/>
+        <AtlasMap margin="0.06" scalingMode="2" atlasDriven="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" enabled="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clipSource="" enabled="0" clippingType="0"/>
+        <itemClippingSettings clipSource="" forceLabelsInside="0" clippingType="0" enabled="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" type="QString" name="atlasRasterFormat"/>
-          <Option value="0" type="int" name="forceVector"/>
-          <Option value="true" type="QString" name="imageAntialias"/>
-          <Option value="0" type="QString" name="imageCropMarginBottom"/>
-          <Option value="0" type="QString" name="imageCropMarginLeft"/>
-          <Option value="0" type="QString" name="imageCropMarginRight"/>
-          <Option value="0" type="QString" name="imageCropMarginTop"/>
-          <Option value="false" type="QString" name="imageCropToContents"/>
-          <Option value="1" type="int" name="pdfAppendGeoreference"/>
-          <Option value="0" type="int" name="pdfCreateGeoPdf"/>
-          <Option value="0" type="int" name="pdfDisableRasterTiles"/>
-          <Option value="" type="QString" name="pdfExportThemes"/>
-          <Option value="1" type="int" name="pdfIncludeMetadata"/>
-          <Option value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~fence_groups_cbaea960_3348_4aea_b155_46e5d310f792~~~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~~~route_markers_d58f7174_b6d0_4e1c_80ed_0d74635b8ca6" type="QString" name="pdfLayerOrder"/>
-          <Option value="0" type="int" name="pdfLosslessImages"/>
-          <Option value="0" type="int" name="pdfOgcBestPracticeFormat"/>
-          <Option value="1" type="int" name="pdfSimplify"/>
-          <Option value="0" type="int" name="pdfTextFormat"/>
-          <Option value="true" type="QString" name="singleFile"/>
+          <Option type="QString" value="png" name="atlasRasterFormat"/>
+          <Option type="int" value="0" name="forceVector"/>
+          <Option type="QString" value="true" name="imageAntialias"/>
+          <Option type="QString" value="0" name="imageCropMarginBottom"/>
+          <Option type="QString" value="0" name="imageCropMarginLeft"/>
+          <Option type="QString" value="0" name="imageCropMarginRight"/>
+          <Option type="QString" value="0" name="imageCropMarginTop"/>
+          <Option type="QString" value="false" name="imageCropToContents"/>
+          <Option type="int" value="1" name="pdfAppendGeoreference"/>
+          <Option type="int" value="0" name="pdfCreateGeoPdf"/>
+          <Option type="int" value="0" name="pdfDisableRasterTiles"/>
+          <Option type="QString" value="" name="pdfExportThemes"/>
+          <Option type="int" value="1" name="pdfIncludeMetadata"/>
+          <Option type="QString" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~fence_groups_cbaea960_3348_4aea_b155_46e5d310f792~~~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~~~route_markers_d58f7174_b6d0_4e1c_80ed_0d74635b8ca6" name="pdfLayerOrder"/>
+          <Option type="int" value="0" name="pdfLosslessImages"/>
+          <Option type="int" value="0" name="pdfOgcBestPracticeFormat"/>
+          <Option type="int" value="1" name="pdfSimplify"/>
+          <Option type="int" value="0" name="pdfTextFormat"/>
+          <Option type="QString" value="true" name="singleFile"/>
         </Option>
       </customproperties>
-      <Atlas hideCoverage="0" pageNameExpression="&quot;Distance&quot;" sortFeatures="1" coverageLayerSource="/home/tim/Documents/Projects/2022/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'" coverageLayerName="all_routes" sortAscending="1" filterFeatures="1" featureFilter="regexp_match( &quot;Source&quot;, '^(5|10|21|Trail)' )" coverageLayer="all_routes_5833accf_77da_42ef_a24a_197208cd2190" sortKey="&quot;Sort&quot;" coverageLayerProvider="ogr" enabled="1"/>
+      <Atlas sortKey="&quot;Sort&quot;" sortAscending="1" filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" coverageLayer="all_routes_5833accf_77da_42ef_a24a_197208cd2190" filterFeatures="1" hideCoverage="0" enabled="1" coverageLayerProvider="ogr" pageNameExpression="&quot;Distance&quot;" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/all_routes.shp|layername=all_routes" featureFilter="regexp_match( &quot;Source&quot;, '^(5|10|21|Trail)' )" coverageLayerName="all_routes" sortFeatures="1"/>
     </Layout>
-    <Layout name="Marshal Plan A1" printResolution="120" worldFileMap="" units="mm">
-      <Snapper snapToItems="1" snapToGuides="1" tolerance="5" snapToGrid="0"/>
-      <Grid resUnits="mm" offsetUnits="mm" offsetY="0" offsetX="0" resolution="10"/>
+    <Layout units="mm" printResolution="120" worldFileMap="" name="Marshal Plan A1">
+      <Snapper snapToGuides="1" tolerance="5" snapToGrid="0" snapToItems="1"/>
+      <Grid resolution="10" offsetY="0" offsetX="0" offsetUnits="mm" resUnits="mm"/>
       <PageCollection>
-        <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+        <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="255,255,255,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="no" type="QString" name="outline_style"/>
-              <Option value="0.26" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+              <Option type="QString" value="255,255,255,255" name="color"/>
+              <Option type="QString" value="miter" name="joinstyle"/>
+              <Option type="QString" value="0,0" name="offset"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+              <Option type="QString" value="MM" name="offset_unit"/>
+              <Option type="QString" value="0,0,0,255" name="outline_color"/>
+              <Option type="QString" value="no" name="outline_style"/>
+              <Option type="QString" value="0.26" name="outline_width"/>
+              <Option type="QString" value="MM" name="outline_width_unit"/>
+              <Option type="QString" value="solid" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
@@ -32445,49 +32535,49 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem outlineWidthM="0.3,mm" groupUuid="" position="0,0,mm" positionLock="false" templateUuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" uuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" type="65638" blendMode="0" size="594,841,mm" opacity="1" visibility="1" referencePoint="0" id="" frame="false" zValue="0" frameJoinStyle="miter" positionOnPage="0,0,mm" background="true" excludeFromExports="0" itemRotation="0">
-          <FrameColor red="0" green="0" blue="0" alpha="255"/>
-          <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+        <LayoutItem referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" groupUuid="" positionOnPage="0,0,mm" positionLock="false" frameJoinStyle="miter" frame="false" type="65638" outlineWidthM="0.3,mm" templateUuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" background="true" size="594,841,mm" zValue="0" uuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" opacity="1" position="0,0,mm" excludeFromExports="0">
+          <FrameColor alpha="255" red="0" blue="0" green="0"/>
+          <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="255,255,255,255" type="QString" name="color"/>
-                <Option value="miter" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="255,255,255,255" name="color"/>
+                <Option type="QString" value="miter" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                <Option type="QString" value="no" name="outline_style"/>
+                <Option type="QString" value="0.26" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -32502,9 +32592,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -32512,15 +32602,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem rasterBorderWidth="0" outlineWidthM="0.3,mm" maxSymbolSize="0" rasterBorderColor="0,0,0,255" frameJoinStyle="miter" excludeFromExports="0" title="" columnCount="1" background="true" rasterBorder="1" boxSpace="2" size="4,4,mm" map_uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" legendFilterByAtlas="0" wmsLegendHeight="25" columnSpace="2" type="65642" symbolAlignment="1" id="" positionLock="true" blendMode="0" positionOnPage="25.5925,18.7971,mm" splitLayer="0" resizeToContents="1" templateUuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" frame="false" opacity="1" uuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" minSymbolSize="0" fontColor="#000000" lineSpacing="1" referencePoint="0" visibility="1" wrapChar="" itemRotation="0" symbolWidth="7" wmsLegendWidth="50" groupUuid="" position="25.5925,18.7971,mm" symbolHeight="4" equalColumnWidth="1" titleAlignment="1" zValue="8">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem splitLayer="0" size="4,4,mm" legendFilterByAtlas="0" boxSpace="2" templateUuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" blendMode="0" maxSymbolSize="0" position="25.5925,18.7971,mm" groupUuid="" wrapChar="" minSymbolSize="0" referencePoint="0" symbolAlignment="1" itemRotation="0" title="" equalColumnWidth="1" resizeToContents="1" wmsLegendHeight="25" columnCount="1" outlineWidthM="0.3,mm" rasterBorder="1" background="true" visibility="1" symbolHeight="4" fontColor="#000000" positionLock="true" zValue="8" titleAlignment="1" lineSpacing="1" columnSpace="2" id="" rasterBorderColor="0,0,0,255" positionOnPage="25.5925,18.7971,mm" excludeFromExports="0" rasterBorderWidth="0" type="65642" wmsLegendWidth="50" uuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" opacity="1" frame="false" symbolWidth="7" map_uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" frameJoinStyle="miter">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -32528,37 +32618,37 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style name="title" indent="0" alignment="1">
-            <styleFont bold="0" style="" italic="0" description="Myriad Pro,16,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0"/>
+          <style indent="0" alignment="1" name="title">
+            <styleFont style="" description="Myriad Pro,16,-1,5,50,0,0,0,0,0" strikethrough="0" italic="0" underline="0" bold="0"/>
           </style>
-          <style name="group" indent="0" alignment="1">
-            <styleFont bold="1" style="Semibold" italic="0" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" underline="0" strikethrough="0"/>
+          <style indent="0" alignment="1" name="group">
+            <styleFont style="Semibold" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0" italic="0" underline="0" bold="1"/>
           </style>
-          <style name="subgroup" indent="0" alignment="1" marginTop="1">
-            <styleFont bold="1" style="Semibold" italic="0" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" underline="0" strikethrough="0"/>
+          <style marginTop="1" indent="0" alignment="1" name="subgroup">
+            <styleFont style="Semibold" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0" italic="0" underline="0" bold="1"/>
           </style>
-          <style name="symbol" indent="0" alignment="1" marginTop="2">
-            <styleFont bold="0" style="" italic="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0"/>
+          <style marginTop="2" indent="0" alignment="1" name="symbol">
+            <styleFont style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0" strikethrough="0" italic="0" underline="0" bold="0"/>
           </style>
-          <style marginLeft="2" name="symbolLabel" indent="0" alignment="1" marginTop="2">
-            <styleFont bold="1" style="Semibold" italic="0" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" underline="0" strikethrough="0"/>
+          <style marginTop="2" marginLeft="2" indent="0" alignment="1" name="symbolLabel">
+            <styleFont style="Semibold" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0" italic="0" underline="0" bold="1"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group checked="Qt::Checked" name="Routes" groupLayer="" expanded="1">
+          <layer-tree-group expanded="1" groupLayer="" checked="Qt::Checked" name="Routes">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer checked="Qt::Checked" legend_exp="" name="all_routes" id="all_routes20170907054841602" legend_split_behavior="0" patch_size="0,0" expanded="1">
+            <layer-tree-layer id="all_routes20170907054841602" expanded="1" legend_split_behavior="0" legend_exp="" patch_size="0,0" checked="Qt::Checked" name="all_routes">
               <customproperties>
                 <Option type="Map">
-                  <Option value="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}" type="QString" name="expandedLegendNodes"/>
-                  <Option value="1,2,3" type="QString" name="legend/node-order"/>
-                  <Option value="hidden" type="QString" name="legend/title-style"/>
-                  <Option value="0" type="QString" name="showFeatureCount"/>
+                  <Option type="QString" value="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}" name="expandedLegendNodes"/>
+                  <Option type="QString" value="1,2,3" name="legend/node-order"/>
+                  <Option type="QString" value="hidden" name="legend/title-style"/>
+                  <Option type="QString" value="0" name="showFeatureCount"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -32566,47 +32656,47 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" valign="64" groupUuid="" position="5.2963,808.939,mm" positionLock="true" templateUuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" uuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" type="65641" blendMode="0" size="91.9494,15.0649,mm" opacity="1" visibility="1" htmlState="0" referencePoint="0" marginX="1" id="" halign="1" frame="false" zValue="7" labelText="MARSHAL POSITIONS" frameJoinStyle="miter" positionOnPage="5.2963,808.939,mm" background="false" marginY="1" excludeFromExports="0" itemRotation="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem marginY="1" referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" htmlState="0" groupUuid="" positionOnPage="5.2963,808.939,mm" positionLock="true" frameJoinStyle="miter" frame="false" type="65641" outlineWidthM="0.3,mm" templateUuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" background="false" size="91.9494,15.0649,mm" labelText="MARSHAL POSITIONS" zValue="7" uuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" opacity="1" position="5.2963,808.939,mm" marginX="1" halign="1" valign="64" excludeFromExports="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="63" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="1" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="12" namedStyle="" forcedItalic="0" fontSizeUnit="Point" allowHtml="0">
+        <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="" fontUnderline="0" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" fontWeight="63" fontStrikeout="0" fontItalic="0" fontSize="12" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferNoFill="1" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="1.5"/>
-          <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeBorderWidth="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <text-buffer bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
+            <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -32621,65 +32711,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" valign="32" groupUuid="" position="430.403,825.052,mm" positionLock="true" templateUuid="{16fde111-eb96-4679-a00f-a129be4e506a}" uuid="{16fde111-eb96-4679-a00f-a129be4e506a}" type="65641" blendMode="0" size="56.6212,15.3656,mm" opacity="1" visibility="1" htmlState="0" referencePoint="0" marginX="1" id="" halign="2" frame="false" zValue="5" labelText="REVISION 1.2" frameJoinStyle="miter" positionOnPage="430.403,825.052,mm" background="false" marginY="1" excludeFromExports="0" itemRotation="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem marginY="1" referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" htmlState="0" groupUuid="" positionOnPage="430.403,825.052,mm" positionLock="true" frameJoinStyle="miter" frame="false" type="65641" outlineWidthM="0.3,mm" templateUuid="{16fde111-eb96-4679-a00f-a129be4e506a}" background="false" size="56.6212,15.3656,mm" labelText="REVISION 1.2" zValue="5" uuid="{16fde111-eb96-4679-a00f-a129be4e506a}" opacity="1" position="430.403,825.052,mm" marginX="1" halign="2" valign="32" excludeFromExports="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="50" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="1" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="12" namedStyle="" forcedItalic="0" fontSizeUnit="Point" allowHtml="0">
+        <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="" fontUnderline="0" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" fontWeight="50" fontStrikeout="0" fontItalic="0" fontSize="12" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferNoFill="1" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="1.5"/>
-          <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeBorderWidth="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <text-buffer bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
+            <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -32694,65 +32784,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" valign="64" groupUuid="" position="372.175,808.942,mm" positionLock="true" templateUuid="{d177957c-7ab6-40ae-8769-347428500538}" uuid="{d177957c-7ab6-40ae-8769-347428500538}" type="65641" blendMode="0" size="114.848,15.0635,mm" opacity="1" visibility="1" htmlState="0" referencePoint="0" marginX="1" id="" halign="2" frame="false" zValue="4" labelText="Sunday, 20 October 2019" frameJoinStyle="miter" positionOnPage="372.175,808.942,mm" background="false" marginY="1" excludeFromExports="0" itemRotation="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem marginY="1" referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" htmlState="0" groupUuid="" positionOnPage="372.175,808.942,mm" positionLock="true" frameJoinStyle="miter" frame="false" type="65641" outlineWidthM="0.3,mm" templateUuid="{d177957c-7ab6-40ae-8769-347428500538}" background="false" size="114.848,15.0635,mm" labelText="Sunday, 20 October 2019" zValue="4" uuid="{d177957c-7ab6-40ae-8769-347428500538}" opacity="1" position="372.175,808.942,mm" marginX="1" halign="2" valign="64" excludeFromExports="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="50" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="1" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="12" namedStyle="" forcedItalic="0" fontSizeUnit="Point" allowHtml="0">
+        <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="" fontUnderline="0" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" fontWeight="50" fontStrikeout="0" fontItalic="0" fontSize="12" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferNoFill="1" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="1.5"/>
-          <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeBorderWidth="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <text-buffer bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
+            <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -32767,39 +32857,39 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" groupUuid="" position="489.557,775.395,mm" anchorPoint="8" positionLock="true" svgFillColor="255,255,255,255" templateUuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" uuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" type="65640" blendMode="0" size="100.498,63.9757,mm" opacity="1" visibility="1" svgBorderColor="0,0,0,255" northMode="0" northOffset="0" referencePoint="0" id="" frame="false" zValue="3" mode="1" frameJoinStyle="miter" resizeMode="0" positionOnPage="489.557,775.395,mm" file="../Gun_Run_Logo.png" svgBorderWidth="0.2" pictureRotation="0" background="false" pictureHeight="63.9757" pictureWidth="63.5856" excludeFromExports="0" itemRotation="0" mapUuid="">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" mapUuid="" svgBorderWidth="0.2" pictureHeight="63.9757" groupUuid="" positionOnPage="489.557,775.395,mm" positionLock="true" frameJoinStyle="miter" mode="1" frame="false" type="65640" outlineWidthM="0.3,mm" resizeMode="0" file="../Gun_Run_Logo.png" northOffset="0" templateUuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" background="false" svgFillColor="255,255,255,255" pictureRotation="0" size="100.498,63.9757,mm" zValue="3" uuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" svgBorderColor="0,0,0,255" northMode="0" opacity="1" position="489.557,775.395,mm" excludeFromExports="0" pictureWidth="63.5856" anchorPoint="8">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedSource">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -32807,42 +32897,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" groupUuid="" position="5.4463,824.155,mm" positionLock="true" templateUuid="{cc073cea-0811-4548-bfd7-924edac8690f}" uuid="{cc073cea-0811-4548-bfd7-924edac8690f}" type="65643" blendMode="0" size="481.428,0.606138,mm" opacity="1" visibility="1" referencePoint="0" id="" frame="false" zValue="2" shapeType="1" cornerRadiusMeasure="0,mm" frameJoinStyle="miter" positionOnPage="5.4463,824.155,mm" background="false" excludeFromExports="0" itemRotation="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" groupUuid="" positionOnPage="5.4463,824.155,mm" positionLock="true" frameJoinStyle="miter" frame="false" type="65643" outlineWidthM="0.3,mm" shapeType="1" cornerRadiusMeasure="0,mm" templateUuid="{cc073cea-0811-4548-bfd7-924edac8690f}" background="false" size="481.428,0.606138,mm" zValue="2" uuid="{cc073cea-0811-4548-bfd7-924edac8690f}" opacity="1" position="5.4463,824.155,mm" excludeFromExports="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+        <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="0,0,0,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="solid" type="QString" name="outline_style"/>
-              <Option value="0.3" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+              <Option type="QString" value="0,0,0,255" name="color"/>
+              <Option type="QString" value="miter" name="joinstyle"/>
+              <Option type="QString" value="0,0" name="offset"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+              <Option type="QString" value="MM" name="offset_unit"/>
+              <Option type="QString" value="0,0,0,255" name="outline_color"/>
+              <Option type="QString" value="solid" name="outline_style"/>
+              <Option type="QString" value="0.3" name="outline_width"/>
+              <Option type="QString" value="MM" name="outline_width_unit"/>
+              <Option type="QString" value="solid" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="0,0,0,255"/>
@@ -32857,90 +32947,90 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" groupUuid="" position="3.94474,5.25965,mm" positionLock="true" templateUuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" type="65639" blendMode="0" followPresetName="Marshal overview" keepLayerSet="false" size="584.759,811.213,mm" opacity="1" visibility="1" referencePoint="0" id="" frame="true" followPreset="true" zValue="1" frameJoinStyle="miter" labelMargin="0,mm" positionOnPage="3.94474,5.25965,mm" mapRotation="0" background="true" excludeFromExports="0" itemRotation="0" drawCanvasItems="false" mapFlags="0" isTemporal="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" drawCanvasItems="false" mapRotation="0" mapFlags="0" groupUuid="" positionOnPage="3.94474,5.25965,mm" positionLock="true" frameJoinStyle="miter" followPresetName="Marshal overview" frame="true" type="65639" outlineWidthM="0.3,mm" labelMargin="0,mm" templateUuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" background="true" size="584.759,811.213,mm" zValue="1" uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" opacity="1" position="3.94474,5.25965,mm" keepLayerSet="false" excludeFromExports="0" isTemporal="0" followPreset="true">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedMapScale">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="field"/>
-                  <Option value="2" type="int" name="type"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="" name="field"/>
+                  <Option type="int" value="2" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapXMin">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="field"/>
-                  <Option value="2" type="int" name="type"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="" name="field"/>
+                  <Option type="int" value="2" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapYMin">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="field"/>
-                  <Option value="2" type="int" name="type"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="" name="field"/>
+                  <Option type="int" value="2" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.37434415142052657" ymax="-33.89072661913806428" ymin="-33.95821655848814657" xmax="18.42299397558693741"/>
+        <Extent ymax="-33.89072661913806428" xmin="18.37434415142052657" ymin="-33.95821655848814657" xmax="18.42299397558693741"/>
         <LayerSet/>
-        <AtlasMap margin="0" atlasDriven="0" scalingMode="2"/>
+        <AtlasMap margin="0" scalingMode="2" atlasDriven="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" enabled="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clipSource="" enabled="0" clippingType="0"/>
+        <itemClippingSettings clipSource="" forceLabelsInside="0" clippingType="0" enabled="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" type="QString" name="atlasRasterFormat"/>
-          <Option value="0" type="QString" name="forceVector"/>
-          <Option value="0" type="QString" name="pdfDisableRasterTiles"/>
-          <Option value="1" type="QString" name="pdfIncludeMetadata"/>
-          <Option value="0" type="QString" name="pdfTextFormat"/>
+          <Option type="QString" value="png" name="atlasRasterFormat"/>
+          <Option type="QString" value="0" name="forceVector"/>
+          <Option type="QString" value="0" name="pdfDisableRasterTiles"/>
+          <Option type="QString" value="1" name="pdfIncludeMetadata"/>
+          <Option type="QString" value="0" name="pdfTextFormat"/>
         </Option>
       </customproperties>
-      <Atlas hideCoverage="1" pageNameExpression="&quot;page&quot;" sortFeatures="1" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" filenamePattern="'output_'||@atlas_featurenumber" coverageLayerName="complete_marshal_overview" sortAscending="1" filterFeatures="0" coverageLayer="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" sortKey="page" coverageLayerProvider="virtual" enabled="1"/>
+      <Atlas sortKey="page" sortAscending="1" filenamePattern="'output_'||@atlas_featurenumber" coverageLayer="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" filterFeatures="0" hideCoverage="1" enabled="1" coverageLayerProvider="virtual" pageNameExpression="&quot;page&quot;" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" coverageLayerName="complete_marshal_overview" sortFeatures="1"/>
     </Layout>
-    <Layout name="Access Roads" printResolution="144" worldFileMap="" units="mm">
-      <Snapper snapToItems="1" snapToGuides="1" tolerance="5" snapToGrid="0"/>
-      <Grid resUnits="mm" offsetUnits="mm" offsetY="0" offsetX="0" resolution="10"/>
+    <Layout units="mm" printResolution="144" worldFileMap="" name="Access Roads">
+      <Snapper snapToGuides="1" tolerance="5" snapToGrid="0" snapToItems="1"/>
+      <Grid resolution="10" offsetY="0" offsetX="0" offsetUnits="mm" resUnits="mm"/>
       <PageCollection>
-        <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+        <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="255,255,255,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="no" type="QString" name="outline_style"/>
-              <Option value="0.26" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+              <Option type="QString" value="255,255,255,255" name="color"/>
+              <Option type="QString" value="miter" name="joinstyle"/>
+              <Option type="QString" value="0,0" name="offset"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+              <Option type="QString" value="MM" name="offset_unit"/>
+              <Option type="QString" value="0,0,0,255" name="outline_color"/>
+              <Option type="QString" value="no" name="outline_style"/>
+              <Option type="QString" value="0.26" name="outline_width"/>
+              <Option type="QString" value="MM" name="outline_width_unit"/>
+              <Option type="QString" value="solid" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
@@ -32955,49 +33045,49 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem outlineWidthM="0.3,mm" groupUuid="" position="0,0,mm" positionLock="false" templateUuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" uuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" type="65638" blendMode="0" size="297,210,mm" opacity="1" visibility="1" referencePoint="0" id="" frame="false" zValue="0" frameJoinStyle="miter" positionOnPage="0,0,mm" background="true" excludeFromExports="0" itemRotation="0">
-          <FrameColor red="0" green="0" blue="0" alpha="255"/>
-          <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+        <LayoutItem referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" groupUuid="" positionOnPage="0,0,mm" positionLock="false" frameJoinStyle="miter" frame="false" type="65638" outlineWidthM="0.3,mm" templateUuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" background="true" size="297,210,mm" zValue="0" uuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" opacity="1" position="0,0,mm" excludeFromExports="0">
+          <FrameColor alpha="255" red="0" blue="0" green="0"/>
+          <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="255,255,255,255" type="QString" name="color"/>
-                <Option value="miter" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="255,255,255,255" name="color"/>
+                <Option type="QString" value="miter" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                <Option type="QString" value="no" name="outline_style"/>
+                <Option type="QString" value="0.26" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -33012,27 +33102,27 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide position="0" page="0" orientation="2" units="mm"/>
+          <Guide page="0" units="mm" orientation="2" position="0"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem rasterBorderWidth="0" outlineWidthM="0.3,mm" maxSymbolSize="0" rasterBorderColor="0,0,0,255" frameJoinStyle="miter" excludeFromExports="0" title="" columnCount="1" background="true" rasterBorder="1" boxSpace="2" size="34.45,40.8,mm" legendFilterByAtlas="0" wmsLegendHeight="25" columnSpace="2" type="65642" symbolAlignment="1" id="" positionLock="true" blendMode="0" positionOnPage="244.484,130.172,mm" splitLayer="0" resizeToContents="1" templateUuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" frame="true" opacity="1" uuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" minSymbolSize="0" fontColor="#000000" lineSpacing="1" referencePoint="0" visibility="1" wrapChar="" itemRotation="0" symbolWidth="7" wmsLegendWidth="50" groupUuid="" position="244.484,130.172,mm" symbolHeight="4" equalColumnWidth="0" titleAlignment="1" zValue="15">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="185"/>
+      <LayoutItem splitLayer="0" size="34.45,40.8,mm" legendFilterByAtlas="0" boxSpace="2" templateUuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" blendMode="0" maxSymbolSize="0" position="244.484,130.172,mm" groupUuid="" wrapChar="" minSymbolSize="0" referencePoint="0" symbolAlignment="1" itemRotation="0" title="" equalColumnWidth="0" resizeToContents="1" wmsLegendHeight="25" columnCount="1" outlineWidthM="0.3,mm" rasterBorder="1" background="true" visibility="1" symbolHeight="4" fontColor="#000000" positionLock="true" zValue="15" titleAlignment="1" lineSpacing="1" columnSpace="2" id="" rasterBorderColor="0,0,0,255" positionOnPage="244.484,130.172,mm" excludeFromExports="0" rasterBorderWidth="0" type="65642" wmsLegendWidth="50" uuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" opacity="1" frame="true" symbolWidth="7" frameJoinStyle="miter">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="185" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -33040,35 +33130,35 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style name="title" indent="0" alignment="1">
-            <styleFont bold="1" style="Semibold" italic="0" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" underline="0" strikethrough="0"/>
+          <style indent="0" alignment="1" name="title">
+            <styleFont style="Semibold" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0" italic="0" underline="0" bold="1"/>
           </style>
-          <style name="group" indent="0" alignment="1" marginTop="3">
-            <styleFont bold="1" style="Semibold" italic="0" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" underline="0" strikethrough="0"/>
+          <style marginTop="3" indent="0" alignment="1" name="group">
+            <styleFont style="Semibold" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0" italic="0" underline="0" bold="1"/>
           </style>
-          <style name="subgroup" indent="0" alignment="1" marginTop="3">
-            <styleFont bold="1" style="Semibold" italic="0" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" underline="0" strikethrough="0"/>
+          <style marginTop="3" indent="0" alignment="1" name="subgroup">
+            <styleFont style="Semibold" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0" italic="0" underline="0" bold="1"/>
           </style>
-          <style name="symbol" indent="0" alignment="1" marginTop="2.5">
-            <styleFont bold="0" style="" italic="0" description="Myriad Pro,9,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0"/>
+          <style marginTop="2.5" indent="0" alignment="1" name="symbol">
+            <styleFont style="" description="Myriad Pro,9,-1,5,50,0,0,0,0,0" strikethrough="0" italic="0" underline="0" bold="0"/>
           </style>
-          <style marginLeft="2" name="symbolLabel" indent="0" alignment="1" marginTop="2">
-            <styleFont bold="0" style="Regular" italic="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular" underline="0" strikethrough="0"/>
+          <style marginTop="2" marginLeft="2" indent="0" alignment="1" name="symbolLabel">
+            <styleFont style="Regular" description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular" strikethrough="0" italic="0" underline="0" bold="0"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group checked="Qt::Checked" name="Residents Access" groupLayer="" expanded="1">
+          <layer-tree-group expanded="1" groupLayer="" checked="Qt::Checked" name="Residents Access">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer checked="Qt::Checked" legend_exp="" source="./residents_access_roads.shp|layername=residents_access_roads" name="residents_access_roads" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" providerKey="ogr" legend_split_behavior="0" patch_size="0,0" expanded="1">
+            <layer-tree-layer id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" expanded="1" legend_split_behavior="0" source="./residents_access_roads.shp|layername=residents_access_roads" legend_exp="" providerKey="ogr" patch_size="0,0" checked="Qt::Checked" name="residents_access_roads">
               <customproperties>
                 <Option type="Map">
                   <Option type="invalid" name="expandedLegendNodes"/>
-                  <Option value="hidden" type="QString" name="legend/title-style"/>
+                  <Option type="QString" value="hidden" name="legend/title-style"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -33076,47 +33166,47 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" valign="64" groupUuid="" position="9.37446,191.81,mm" positionLock="true" templateUuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" uuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" type="65641" blendMode="0" size="194.851,7.272,mm" opacity="1" visibility="1" htmlState="0" referencePoint="0" marginX="0" id="" halign="1" frame="false" zValue="8" labelText="ACCESS ROUTES FOR RESIDENTS" frameJoinStyle="miter" positionOnPage="9.37446,191.81,mm" background="false" marginY="1" excludeFromExports="0" itemRotation="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem marginY="1" referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" htmlState="0" groupUuid="" positionOnPage="9.37446,191.81,mm" positionLock="true" frameJoinStyle="miter" frame="false" type="65641" outlineWidthM="0.3,mm" templateUuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" background="false" size="194.851,7.272,mm" labelText="ACCESS ROUTES FOR RESIDENTS" zValue="8" uuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" opacity="1" position="9.37446,191.81,mm" marginX="0" halign="1" valign="64" excludeFromExports="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="50" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="1" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="14" namedStyle="" forcedItalic="0" fontSizeUnit="Point" allowHtml="0">
+        <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="" fontUnderline="0" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" fontWeight="50" fontStrikeout="0" fontItalic="0" fontSize="14" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferNoFill="1" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="1.5"/>
-          <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeBorderWidth="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <text-buffer bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
+            <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -33131,65 +33221,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" valign="64" groupUuid="" position="204.225,191.81,mm" positionLock="true" templateUuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" uuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" type="65641" blendMode="0" size="57.4836,6.8714,mm" opacity="1" visibility="1" htmlState="0" referencePoint="0" marginX="1" id="" halign="2" frame="false" zValue="6" labelText="REVISION 1.1" frameJoinStyle="miter" positionOnPage="204.225,191.81,mm" background="false" marginY="1" excludeFromExports="0" itemRotation="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem marginY="1" referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" htmlState="0" groupUuid="" positionOnPage="204.225,191.81,mm" positionLock="true" frameJoinStyle="miter" frame="false" type="65641" outlineWidthM="0.3,mm" templateUuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" background="false" size="57.4836,6.8714,mm" labelText="REVISION 1.1" zValue="6" uuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" opacity="1" position="204.225,191.81,mm" marginX="1" halign="2" valign="64" excludeFromExports="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="50" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="1" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="12" namedStyle="" forcedItalic="0" fontSizeUnit="Point" allowHtml="0">
+        <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="" fontUnderline="0" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" fontWeight="50" fontStrikeout="0" fontItalic="0" fontSize="12" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferNoFill="1" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="1.5"/>
-          <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeBorderWidth="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <text-buffer bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
+            <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -33204,65 +33294,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" valign="64" groupUuid="" position="210.038,199.082,mm" positionLock="true" templateUuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" uuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" type="65641" blendMode="0" size="51.6706,6.60801,mm" opacity="1" visibility="1" htmlState="0" referencePoint="0" marginX="1" id="" halign="2" frame="false" zValue="5" labelText="Sunday, 20 October 2019" frameJoinStyle="miter" positionOnPage="210.038,199.082,mm" background="false" marginY="1" excludeFromExports="0" itemRotation="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem marginY="1" referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" htmlState="0" groupUuid="" positionOnPage="210.038,199.082,mm" positionLock="true" frameJoinStyle="miter" frame="false" type="65641" outlineWidthM="0.3,mm" templateUuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" background="false" size="51.6706,6.60801,mm" labelText="Sunday, 20 October 2019" zValue="5" uuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" opacity="1" position="210.038,199.082,mm" marginX="1" halign="2" valign="64" excludeFromExports="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="50" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="1" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="12" namedStyle="" forcedItalic="0" fontSizeUnit="Point" allowHtml="0">
+        <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="" fontUnderline="0" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" fontWeight="50" fontStrikeout="0" fontItalic="0" fontSize="12" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferNoFill="1" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="1.5"/>
-          <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeBorderWidth="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <text-buffer bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
+            <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -33277,39 +33367,39 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" groupUuid="" position="262.196,188.218,mm" anchorPoint="4" positionLock="true" svgFillColor="255,255,255,255" templateUuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" uuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" type="65640" blendMode="0" size="29.7523,17.4718,mm" opacity="1" visibility="1" svgBorderColor="0,0,0,255" northMode="0" northOffset="0" referencePoint="0" id="" frame="false" zValue="4" mode="1" frameJoinStyle="miter" resizeMode="0" positionOnPage="262.196,188.218,mm" file="../Gun_Run_Logo.png" svgBorderWidth="0.2" pictureRotation="0" background="false" pictureHeight="17.4718" pictureWidth="17.3653" excludeFromExports="0" itemRotation="0" mapUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" mapUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" svgBorderWidth="0.2" pictureHeight="17.4718" groupUuid="" positionOnPage="262.196,188.218,mm" positionLock="true" frameJoinStyle="miter" mode="1" frame="false" type="65640" outlineWidthM="0.3,mm" resizeMode="0" file="../Gun_Run_Logo.png" northOffset="0" templateUuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" background="false" svgFillColor="255,255,255,255" pictureRotation="0" size="29.7523,17.4718,mm" zValue="4" uuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" svgBorderColor="0,0,0,255" northMode="0" opacity="1" position="262.196,188.218,mm" excludeFromExports="0" pictureWidth="17.3653" anchorPoint="4">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedSource">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -33317,42 +33407,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" groupUuid="" position="9.59946,198.832,mm" positionLock="true" templateUuid="{01219eef-e96b-45c3-a449-5e0250541019}" uuid="{01219eef-e96b-45c3-a449-5e0250541019}" type="65643" blendMode="0" size="251.959,0.1,mm" opacity="1" visibility="1" referencePoint="0" id="" frame="false" zValue="3" shapeType="1" cornerRadiusMeasure="0,mm" frameJoinStyle="miter" positionOnPage="9.59946,198.832,mm" background="false" excludeFromExports="0" itemRotation="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" groupUuid="" positionOnPage="9.59946,198.832,mm" positionLock="true" frameJoinStyle="miter" frame="false" type="65643" outlineWidthM="0.3,mm" shapeType="1" cornerRadiusMeasure="0,mm" templateUuid="{01219eef-e96b-45c3-a449-5e0250541019}" background="false" size="251.959,0.1,mm" zValue="3" uuid="{01219eef-e96b-45c3-a449-5e0250541019}" opacity="1" position="9.59946,198.832,mm" excludeFromExports="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+        <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="0,0,0,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="solid" type="QString" name="outline_style"/>
-              <Option value="0.3" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+              <Option type="QString" value="0,0,0,255" name="color"/>
+              <Option type="QString" value="miter" name="joinstyle"/>
+              <Option type="QString" value="0,0" name="offset"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+              <Option type="QString" value="MM" name="offset_unit"/>
+              <Option type="QString" value="0,0,0,255" name="outline_color"/>
+              <Option type="QString" value="solid" name="outline_style"/>
+              <Option type="QString" value="0.3" name="outline_width"/>
+              <Option type="QString" value="MM" name="outline_width_unit"/>
+              <Option type="QString" value="solid" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="0,0,0,255"/>
@@ -33367,61 +33457,61 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" groupUuid="" position="5.86559,4.09761,mm" positionLock="true" templateUuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" uuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" type="65639" blendMode="0" followPresetName="Access Routes" keepLayerSet="false" size="67.7828,166.874,mm" opacity="1" visibility="1" referencePoint="0" id="" frame="true" followPreset="true" zValue="2" frameJoinStyle="miter" labelMargin="0,mm" positionOnPage="5.86559,4.09761,mm" mapRotation="0" background="true" excludeFromExports="0" itemRotation="0" drawCanvasItems="false" mapFlags="0" isTemporal="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" drawCanvasItems="false" mapRotation="0" mapFlags="0" groupUuid="" positionOnPage="5.86559,4.09761,mm" positionLock="true" frameJoinStyle="miter" followPresetName="Access Routes" frame="true" type="65639" outlineWidthM="0.3,mm" labelMargin="0,mm" templateUuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" background="true" size="67.7828,166.874,mm" zValue="2" uuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" opacity="1" position="5.86559,4.09761,mm" keepLayerSet="false" excludeFromExports="0" isTemporal="0" followPreset="true">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedMapScale">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;END" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapXMax">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.424'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.419'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.417'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.424'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.419'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.417'&#xa;END" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapXMin">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.3728857'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.3728857'&#xa;END" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapYMax">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.893'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.897'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.898'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.893'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.897'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.898'&#xa;END" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapYMin">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.9465293'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.9465293'&#xa;END" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedOpacity">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="1" type="int" name="type"/>
-                  <Option value="" type="QString" name="val"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="int" value="1" name="type"/>
+                  <Option type="QString" value="" name="val"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.37288570000000121" ymax="-33.91513741583252539" ymin="-33.94652930000000168" xmax="18.38563681624126289"/>
+        <Extent ymax="-33.91513741583252539" xmin="18.37288570000000121" ymin="-33.94652930000000168" xmax="18.38563681624126289"/>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
             <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
@@ -33436,45 +33526,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid show="0" rotatedTicksEnabled="0" gridFrameStyle="0" crossLength="3" gridFrameMargin="0" leftFrameDivisions="0" bottomFrameDivisions="0" gridFramePenThickness="0.5" topAnnotationDisplay="0" topAnnotationPosition="1" rotatedTicksMinimumAngle="0" name="Grid 1" showAnnotation="0" rotatedAnnotationsEnabled="0" rotatedTicksLengthMode="0" annotationExpression="" intervalX="0" bottomAnnotationPosition="1" rightAnnotationDisplay="0" rotatedAnnotationsMinimumAngle="0" annotationPrecision="3" frameFillColor1="255,255,255,255" blendMode="0" offsetY="0" gridFrameWidth="2" leftAnnotationDisplay="0" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" rotatedAnnotationsMarginToCorner="0" topFrameDivisions="0" topAnnotationDirection="0" rightAnnotationPosition="1" rotatedTicksMarginToCorner="0" gridStyle="0" minimumIntervalWidth="50" intervalY="0" unit="0" maximumIntervalWidth="100" gridFrameSideFlags="15" frameAnnotationDistance="1" frameFillColor2="0,0,0,255" rightAnnotationDirection="0" position="3" bottomAnnotationDisplay="0" leftAnnotationPosition="1" rotatedAnnotationsLengthMode="0" annotationFormat="0" gridFramePenColor="0,0,0,255" leftAnnotationDirection="0" rightFrameDivisions="0" bottomAnnotationDirection="0" offsetX="0">
+        <ComposerMapGrid bottomAnnotationPosition="1" frameFillColor2="0,0,0,255" blendMode="0" bottomAnnotationDisplay="0" name="Grid 1" frameFillColor1="255,255,255,255" position="3" bottomFrameDivisions="0" topAnnotationPosition="1" crossLength="3" leftAnnotationDisplay="0" intervalY="0" rotatedAnnotationsMarginToCorner="0" gridFrameStyle="0" annotationFormat="0" topAnnotationDirection="0" leftFrameDivisions="0" topFrameDivisions="0" annotationPrecision="3" rotatedTicksMinimumAngle="0" rightFrameDivisions="0" maximumIntervalWidth="100" unit="0" rotatedTicksEnabled="0" topAnnotationDisplay="0" leftAnnotationPosition="1" show="0" rotatedTicksMarginToCorner="0" rotatedTicksLengthMode="0" gridStyle="0" rotatedAnnotationsMinimumAngle="0" minimumIntervalWidth="50" bottomAnnotationDirection="0" annotationExpression="" intervalX="0" offsetY="0" offsetX="0" gridFramePenColor="0,0,0,255" gridFrameMargin="0" gridFrameWidth="2" rightAnnotationDisplay="0" rotatedAnnotationsEnabled="0" leftAnnotationDirection="0" rightAnnotationDirection="0" gridFrameSideFlags="15" gridFramePenThickness="0.5" showAnnotation="0" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" rightAnnotationPosition="1" frameAnnotationDistance="1" rotatedAnnotationsLengthMode="0">
           <lineStyle>
-            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0,0,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0,0,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -33505,44 +33595,44 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+              <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="angle"/>
-                  <Option value="square" type="QString" name="cap_style"/>
-                  <Option value="0,0,0,255" type="QString" name="color"/>
-                  <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="circle" type="QString" name="name"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                  <Option value="solid" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="diameter" type="QString" name="scale_method"/>
-                  <Option value="2" type="QString" name="size"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="size_unit"/>
-                  <Option value="1" type="QString" name="vertical_anchor_point"/>
+                  <Option type="QString" value="0" name="angle"/>
+                  <Option type="QString" value="square" name="cap_style"/>
+                  <Option type="QString" value="0,0,0,255" name="color"/>
+                  <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="circle" name="name"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                  <Option type="QString" value="solid" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="diameter" name="scale_method"/>
+                  <Option type="QString" value="2" name="size"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="size_unit"/>
+                  <Option type="QString" value="1" name="vertical_anchor_point"/>
                 </Option>
                 <prop k="angle" v="0"/>
                 <prop k="cap_style" v="square"/>
@@ -33565,40 +33655,40 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="50" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="1" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="10" namedStyle="" forcedItalic="0" fontSizeUnit="Point" allowHtml="0">
+          <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="" fontUnderline="0" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" fontWeight="50" fontStrikeout="0" fontItalic="0" fontSize="10" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" textOrientation="horizontal">
             <families/>
-            <text-buffer bufferNoFill="1" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="1.5"/>
-            <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeBorderWidth="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-              <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <text-buffer bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+            <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskType="0"/>
+            <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
+              <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                    <Option value="255,255,255,255" type="QString" name="color"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                    <Option value="no" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="solid" type="QString" name="style"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                    <Option type="QString" value="255,255,255,255" name="color"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                    <Option type="QString" value="no" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="solid" name="style"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -33613,29 +33703,29 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+            <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -33643,45 +33733,45 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap margin="0.05" atlasDriven="0" scalingMode="2"/>
+        <AtlasMap margin="0.05" scalingMode="2" atlasDriven="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" enabled="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clipSource="" enabled="0" clippingType="0"/>
+        <itemClippingSettings clipSource="" forceLabelsInside="0" clippingType="0" enabled="0"/>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.15,mm" groupUuid="" position="9.44946,9.08557,mm" positionLock="true" templateUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" uuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" type="65639" blendMode="0" followPresetName="Access Routes" keepLayerSet="false" size="282.012,175.592,mm" opacity="1" visibility="1" referencePoint="0" id="" frame="true" followPreset="true" zValue="1" frameJoinStyle="round" labelMargin="0,mm" positionOnPage="9.44946,9.08557,mm" mapRotation="0" background="true" excludeFromExports="0" itemRotation="0" drawCanvasItems="false" mapFlags="0" isTemporal="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" drawCanvasItems="false" mapRotation="0" mapFlags="0" groupUuid="" positionOnPage="9.44946,9.08557,mm" positionLock="true" frameJoinStyle="round" followPresetName="Access Routes" frame="true" type="65639" outlineWidthM="0.15,mm" labelMargin="0,mm" templateUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" background="true" size="282.012,175.592,mm" zValue="1" uuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" opacity="1" position="9.44946,9.08557,mm" keepLayerSet="false" excludeFromExports="0" isTemporal="0" followPreset="true">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedMapScale">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '10000'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '5500'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '10000'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '5500'&#xa;END" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapXMin">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.370'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.374'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.3975'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.370'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.374'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.3975'&#xa;END" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapYMin">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.930'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.923'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.912'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.930'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.923'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.912'&#xa;END" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.37000000000000099" ymax="-33.89697816224119009" ymin="-33.92999999999999972" xmax="18.42303507276415431"/>
+        <Extent ymax="-33.89697816224119009" xmin="18.37000000000000099" ymin="-33.92999999999999972" xmax="18.42303507276415431"/>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
             <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
@@ -33696,45 +33786,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid show="0" rotatedTicksEnabled="0" gridFrameStyle="0" crossLength="3" gridFrameMargin="0" leftFrameDivisions="0" bottomFrameDivisions="0" gridFramePenThickness="0.5" topAnnotationDisplay="0" topAnnotationPosition="1" rotatedTicksMinimumAngle="0" name="Grid 1" showAnnotation="0" rotatedAnnotationsEnabled="0" rotatedTicksLengthMode="0" annotationExpression="" intervalX="0" bottomAnnotationPosition="1" rightAnnotationDisplay="0" rotatedAnnotationsMinimumAngle="0" annotationPrecision="3" frameFillColor1="255,255,255,255" blendMode="0" offsetY="0" gridFrameWidth="2" leftAnnotationDisplay="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" rotatedAnnotationsMarginToCorner="0" topFrameDivisions="0" topAnnotationDirection="0" rightAnnotationPosition="1" rotatedTicksMarginToCorner="0" gridStyle="0" minimumIntervalWidth="50" intervalY="0" unit="0" maximumIntervalWidth="100" gridFrameSideFlags="15" frameAnnotationDistance="1" frameFillColor2="0,0,0,255" rightAnnotationDirection="0" position="3" bottomAnnotationDisplay="0" leftAnnotationPosition="1" rotatedAnnotationsLengthMode="0" annotationFormat="0" gridFramePenColor="0,0,0,255" leftAnnotationDirection="0" rightFrameDivisions="0" bottomAnnotationDirection="0" offsetX="0">
+        <ComposerMapGrid bottomAnnotationPosition="1" frameFillColor2="0,0,0,255" blendMode="0" bottomAnnotationDisplay="0" name="Grid 1" frameFillColor1="255,255,255,255" position="3" bottomFrameDivisions="0" topAnnotationPosition="1" crossLength="3" leftAnnotationDisplay="0" intervalY="0" rotatedAnnotationsMarginToCorner="0" gridFrameStyle="0" annotationFormat="0" topAnnotationDirection="0" leftFrameDivisions="0" topFrameDivisions="0" annotationPrecision="3" rotatedTicksMinimumAngle="0" rightFrameDivisions="0" maximumIntervalWidth="100" unit="0" rotatedTicksEnabled="0" topAnnotationDisplay="0" leftAnnotationPosition="1" show="0" rotatedTicksMarginToCorner="0" rotatedTicksLengthMode="0" gridStyle="0" rotatedAnnotationsMinimumAngle="0" minimumIntervalWidth="50" bottomAnnotationDirection="0" annotationExpression="" intervalX="0" offsetY="0" offsetX="0" gridFramePenColor="0,0,0,255" gridFrameMargin="0" gridFrameWidth="2" rightAnnotationDisplay="0" rotatedAnnotationsEnabled="0" leftAnnotationDirection="0" rightAnnotationDirection="0" gridFrameSideFlags="15" gridFramePenThickness="0.5" showAnnotation="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" rightAnnotationPosition="1" frameAnnotationDistance="1" rotatedAnnotationsLengthMode="0">
           <lineStyle>
-            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0,0,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0,0,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -33765,44 +33855,44 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+              <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="angle"/>
-                  <Option value="square" type="QString" name="cap_style"/>
-                  <Option value="0,0,0,255" type="QString" name="color"/>
-                  <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="circle" type="QString" name="name"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                  <Option value="solid" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="diameter" type="QString" name="scale_method"/>
-                  <Option value="2" type="QString" name="size"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="size_unit"/>
-                  <Option value="1" type="QString" name="vertical_anchor_point"/>
+                  <Option type="QString" value="0" name="angle"/>
+                  <Option type="QString" value="square" name="cap_style"/>
+                  <Option type="QString" value="0,0,0,255" name="color"/>
+                  <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="circle" name="name"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                  <Option type="QString" value="solid" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="diameter" name="scale_method"/>
+                  <Option type="QString" value="2" name="size"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="size_unit"/>
+                  <Option type="QString" value="1" name="vertical_anchor_point"/>
                 </Option>
                 <prop k="angle" v="0"/>
                 <prop k="cap_style" v="square"/>
@@ -33825,40 +33915,40 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="50" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="1" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="10" namedStyle="" forcedItalic="0" fontSizeUnit="Point" allowHtml="0">
+          <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="" fontUnderline="0" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" fontWeight="50" fontStrikeout="0" fontItalic="0" fontSize="10" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" textOrientation="horizontal">
             <families/>
-            <text-buffer bufferNoFill="1" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="1.5"/>
-            <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeBorderWidth="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-              <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <text-buffer bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+            <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskType="0"/>
+            <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
+              <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                    <Option value="255,255,255,255" type="QString" name="color"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                    <Option value="no" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="solid" type="QString" name="style"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                    <Option type="QString" value="255,255,255,255" name="color"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                    <Option type="QString" value="no" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="solid" name="style"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -33873,29 +33963,29 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+            <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -33903,56 +33993,56 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
+        <AtlasMap margin="0.10000000000000001" scalingMode="2" atlasDriven="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" enabled="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clipSource="" enabled="0" clippingType="0"/>
+        <itemClippingSettings clipSource="" forceLabelsInside="0" clippingType="0" enabled="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" type="QString" name="atlasRasterFormat"/>
-          <Option value="0" type="QString" name="forceVector"/>
-          <Option value="true" type="QString" name="imageAntialias"/>
-          <Option value="0" type="QString" name="imageCropMarginBottom"/>
-          <Option value="0" type="QString" name="imageCropMarginLeft"/>
-          <Option value="0" type="QString" name="imageCropMarginRight"/>
-          <Option value="0" type="QString" name="imageCropMarginTop"/>
-          <Option value="false" type="QString" name="imageCropToContents"/>
-          <Option value="0" type="QString" name="pdfDisableRasterTiles"/>
-          <Option value="1" type="QString" name="pdfIncludeMetadata"/>
-          <Option value="0" type="QString" name="pdfTextFormat"/>
-          <Option value="false" type="QString" name="singleFile"/>
+          <Option type="QString" value="png" name="atlasRasterFormat"/>
+          <Option type="QString" value="0" name="forceVector"/>
+          <Option type="QString" value="true" name="imageAntialias"/>
+          <Option type="QString" value="0" name="imageCropMarginBottom"/>
+          <Option type="QString" value="0" name="imageCropMarginLeft"/>
+          <Option type="QString" value="0" name="imageCropMarginRight"/>
+          <Option type="QString" value="0" name="imageCropMarginTop"/>
+          <Option type="QString" value="false" name="imageCropToContents"/>
+          <Option type="QString" value="0" name="pdfDisableRasterTiles"/>
+          <Option type="QString" value="1" name="pdfIncludeMetadata"/>
+          <Option type="QString" value="0" name="pdfTextFormat"/>
+          <Option type="QString" value="false" name="singleFile"/>
         </Option>
       </customproperties>
-      <Atlas hideCoverage="1" pageNameExpression="&quot;FID&quot;" sortFeatures="0" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" coverageLayerName="residents_access" filterFeatures="0" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" coverageLayerProvider="ogr" enabled="1"/>
+      <Atlas filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" filterFeatures="0" hideCoverage="1" enabled="1" coverageLayerProvider="ogr" pageNameExpression="&quot;FID&quot;" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" coverageLayerName="residents_access" sortFeatures="0"/>
     </Layout>
-    <Layout name="Golf Course Access" printResolution="144" worldFileMap="{1717b463-32cf-4d87-9f5a-0e8302026e12}" units="mm">
-      <Snapper snapToItems="1" snapToGuides="1" tolerance="5" snapToGrid="0"/>
-      <Grid resUnits="mm" offsetUnits="mm" offsetY="0" offsetX="0" resolution="10"/>
+    <Layout units="mm" printResolution="144" worldFileMap="{1717b463-32cf-4d87-9f5a-0e8302026e12}" name="Golf Course Access">
+      <Snapper snapToGuides="1" tolerance="5" snapToGrid="0" snapToItems="1"/>
+      <Grid resolution="10" offsetY="0" offsetX="0" offsetUnits="mm" resUnits="mm"/>
       <PageCollection>
-        <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+        <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="255,255,255,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="no" type="QString" name="outline_style"/>
-              <Option value="0.26" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+              <Option type="QString" value="255,255,255,255" name="color"/>
+              <Option type="QString" value="miter" name="joinstyle"/>
+              <Option type="QString" value="0,0" name="offset"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+              <Option type="QString" value="MM" name="offset_unit"/>
+              <Option type="QString" value="0,0,0,255" name="outline_color"/>
+              <Option type="QString" value="no" name="outline_style"/>
+              <Option type="QString" value="0.26" name="outline_width"/>
+              <Option type="QString" value="MM" name="outline_width_unit"/>
+              <Option type="QString" value="solid" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
@@ -33967,49 +34057,49 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem outlineWidthM="0.3,mm" groupUuid="" position="0,0,mm" positionLock="false" templateUuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" uuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" type="65638" blendMode="0" size="297,210,mm" opacity="1" visibility="1" referencePoint="0" id="" frame="false" zValue="0" frameJoinStyle="miter" positionOnPage="0,0,mm" background="true" excludeFromExports="0" itemRotation="0">
-          <FrameColor red="0" green="0" blue="0" alpha="255"/>
-          <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+        <LayoutItem referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" groupUuid="" positionOnPage="0,0,mm" positionLock="false" frameJoinStyle="miter" frame="false" type="65638" outlineWidthM="0.3,mm" templateUuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" background="true" size="297,210,mm" zValue="0" uuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" opacity="1" position="0,0,mm" excludeFromExports="0">
+          <FrameColor alpha="255" red="0" blue="0" green="0"/>
+          <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="255,255,255,255" type="QString" name="color"/>
-                <Option value="miter" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="255,255,255,255" name="color"/>
+                <Option type="QString" value="miter" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                <Option type="QString" value="no" name="outline_style"/>
+                <Option type="QString" value="0.26" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -34024,59 +34114,59 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide position="0" page="0" orientation="2" units="mm"/>
+          <Guide page="0" units="mm" orientation="2" position="0"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem outlineWidthM="0.3,mm" valign="64" groupUuid="" position="9.37446,191.81,mm" positionLock="true" templateUuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" uuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" type="65641" blendMode="0" size="194.851,7.272,mm" opacity="1" visibility="1" htmlState="0" referencePoint="0" marginX="0" id="" halign="1" frame="false" zValue="8" labelText="Access to P9 Parking and VIP Tent" frameJoinStyle="miter" positionOnPage="9.37446,191.81,mm" background="false" marginY="1" excludeFromExports="0" itemRotation="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem marginY="1" referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" htmlState="0" groupUuid="" positionOnPage="9.37446,191.81,mm" positionLock="true" frameJoinStyle="miter" frame="false" type="65641" outlineWidthM="0.3,mm" templateUuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" background="false" size="194.851,7.272,mm" labelText="Access to P9 Parking and VIP Tent" zValue="8" uuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" opacity="1" position="9.37446,191.81,mm" marginX="0" halign="1" valign="64" excludeFromExports="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="50" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="1" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="14" namedStyle="" forcedItalic="0" fontSizeUnit="Point" allowHtml="0">
+        <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="" fontUnderline="0" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" fontWeight="50" fontStrikeout="0" fontItalic="0" fontSize="14" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferNoFill="1" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="1.5"/>
-          <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeBorderWidth="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <text-buffer bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
+            <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -34091,65 +34181,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" valign="64" groupUuid="" position="204.225,191.81,mm" positionLock="true" templateUuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" uuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" type="65641" blendMode="0" size="57.4836,6.8714,mm" opacity="1" visibility="1" htmlState="0" referencePoint="0" marginX="1" id="" halign="2" frame="false" zValue="6" labelText="REVISION 1.0" frameJoinStyle="miter" positionOnPage="204.225,191.81,mm" background="false" marginY="1" excludeFromExports="0" itemRotation="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem marginY="1" referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" htmlState="0" groupUuid="" positionOnPage="204.225,191.81,mm" positionLock="true" frameJoinStyle="miter" frame="false" type="65641" outlineWidthM="0.3,mm" templateUuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" background="false" size="57.4836,6.8714,mm" labelText="REVISION 1.0" zValue="6" uuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" opacity="1" position="204.225,191.81,mm" marginX="1" halign="2" valign="64" excludeFromExports="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="50" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="1" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="12" namedStyle="" forcedItalic="0" fontSizeUnit="Point" allowHtml="0">
+        <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="" fontUnderline="0" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" fontWeight="50" fontStrikeout="0" fontItalic="0" fontSize="12" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferNoFill="1" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="1.5"/>
-          <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeBorderWidth="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <text-buffer bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
+            <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -34164,65 +34254,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" valign="64" groupUuid="" position="210.038,199.082,mm" positionLock="true" templateUuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" uuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" type="65641" blendMode="0" size="51.6706,6.60801,mm" opacity="1" visibility="1" htmlState="0" referencePoint="0" marginX="1" id="" halign="2" frame="false" zValue="5" labelText="Sunday, 20 October 2019" frameJoinStyle="miter" positionOnPage="210.038,199.082,mm" background="false" marginY="1" excludeFromExports="0" itemRotation="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem marginY="1" referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" htmlState="0" groupUuid="" positionOnPage="210.038,199.082,mm" positionLock="true" frameJoinStyle="miter" frame="false" type="65641" outlineWidthM="0.3,mm" templateUuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" background="false" size="51.6706,6.60801,mm" labelText="Sunday, 20 October 2019" zValue="5" uuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" opacity="1" position="210.038,199.082,mm" marginX="1" halign="2" valign="64" excludeFromExports="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="50" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="1" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="12" namedStyle="" forcedItalic="0" fontSizeUnit="Point" allowHtml="0">
+        <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="" fontUnderline="0" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" fontWeight="50" fontStrikeout="0" fontItalic="0" fontSize="12" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferNoFill="1" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="1.5"/>
-          <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeBorderWidth="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <text-buffer bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
+            <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -34237,39 +34327,39 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" groupUuid="" position="262.196,188.218,mm" anchorPoint="4" positionLock="true" svgFillColor="255,255,255,255" templateUuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" uuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" type="65640" blendMode="0" size="29.7523,17.4718,mm" opacity="1" visibility="1" svgBorderColor="0,0,0,255" northMode="0" northOffset="0" referencePoint="0" id="" frame="false" zValue="4" mode="1" frameJoinStyle="miter" resizeMode="0" positionOnPage="262.196,188.218,mm" file="../Gun_Run_Logo.png" svgBorderWidth="0.2" pictureRotation="0" background="false" pictureHeight="17.4718" pictureWidth="17.3653" excludeFromExports="0" itemRotation="0" mapUuid="">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" mapUuid="" svgBorderWidth="0.2" pictureHeight="17.4718" groupUuid="" positionOnPage="262.196,188.218,mm" positionLock="true" frameJoinStyle="miter" mode="1" frame="false" type="65640" outlineWidthM="0.3,mm" resizeMode="0" file="../Gun_Run_Logo.png" northOffset="0" templateUuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" background="false" svgFillColor="255,255,255,255" pictureRotation="0" size="29.7523,17.4718,mm" zValue="4" uuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" svgBorderColor="0,0,0,255" northMode="0" opacity="1" position="262.196,188.218,mm" excludeFromExports="0" pictureWidth="17.3653" anchorPoint="4">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedSource">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -34277,42 +34367,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" groupUuid="" position="9.59946,198.832,mm" positionLock="true" templateUuid="{6df60d25-1d7e-4e06-8988-483618276a67}" uuid="{6df60d25-1d7e-4e06-8988-483618276a67}" type="65643" blendMode="0" size="251.959,0.1,mm" opacity="1" visibility="1" referencePoint="0" id="" frame="false" zValue="3" shapeType="1" cornerRadiusMeasure="0,mm" frameJoinStyle="miter" positionOnPage="9.59946,198.832,mm" background="false" excludeFromExports="0" itemRotation="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" groupUuid="" positionOnPage="9.59946,198.832,mm" positionLock="true" frameJoinStyle="miter" frame="false" type="65643" outlineWidthM="0.3,mm" shapeType="1" cornerRadiusMeasure="0,mm" templateUuid="{6df60d25-1d7e-4e06-8988-483618276a67}" background="false" size="251.959,0.1,mm" zValue="3" uuid="{6df60d25-1d7e-4e06-8988-483618276a67}" opacity="1" position="9.59946,198.832,mm" excludeFromExports="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+        <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="0,0,0,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="solid" type="QString" name="outline_style"/>
-              <Option value="0.3" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+              <Option type="QString" value="0,0,0,255" name="color"/>
+              <Option type="QString" value="miter" name="joinstyle"/>
+              <Option type="QString" value="0,0" name="offset"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+              <Option type="QString" value="MM" name="offset_unit"/>
+              <Option type="QString" value="0,0,0,255" name="outline_color"/>
+              <Option type="QString" value="solid" name="outline_style"/>
+              <Option type="QString" value="0.3" name="outline_width"/>
+              <Option type="QString" value="MM" name="outline_width_unit"/>
+              <Option type="QString" value="solid" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="0,0,0,255"/>
@@ -34327,46 +34417,46 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.15,mm" groupUuid="" position="9.44946,7.25098,mm" positionLock="false" templateUuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" uuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" type="65639" blendMode="0" followPresetName="" keepLayerSet="false" size="282.012,182.649,mm" opacity="1" visibility="1" referencePoint="0" id="" frame="false" followPreset="false" zValue="1" frameJoinStyle="round" labelMargin="0,mm" positionOnPage="9.44946,7.25098,mm" mapRotation="0" background="true" excludeFromExports="0" itemRotation="0" drawCanvasItems="false" mapFlags="0" isTemporal="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" drawCanvasItems="false" mapRotation="0" mapFlags="0" groupUuid="" positionOnPage="9.44946,7.25098,mm" positionLock="false" frameJoinStyle="round" followPresetName="" frame="false" type="65639" outlineWidthM="0.15,mm" labelMargin="0,mm" templateUuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" background="true" size="282.012,182.649,mm" zValue="1" uuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" opacity="1" position="9.44946,7.25098,mm" keepLayerSet="false" excludeFromExports="0" isTemporal="0" followPreset="false">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedMapScale">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '10000'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '5500'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '13000'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '10000'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '5500'&#xa;END" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapXMin">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.370'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.374'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.3975'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.370'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.374'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.3975'&#xa;END" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapYMin">
-                  <Option value="true" type="bool" name="active"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.930'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.923'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.912'&#xa;END" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.930'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.923'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.912'&#xa;END" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.40103928699269886" ymax="-33.90319854486631357" ymin="-33.90848231674397084" xmax="18.40919746780259914"/>
+        <Extent ymax="-33.90319854486631357" xmin="18.40103928699269886" ymin="-33.90848231674397084" xmax="18.40919746780259914"/>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
             <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
@@ -34381,45 +34471,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid show="0" rotatedTicksEnabled="0" gridFrameStyle="0" crossLength="3" gridFrameMargin="0" leftFrameDivisions="0" bottomFrameDivisions="0" gridFramePenThickness="0.5" topAnnotationDisplay="0" topAnnotationPosition="1" rotatedTicksMinimumAngle="0" name="Grid 1" showAnnotation="0" rotatedAnnotationsEnabled="0" rotatedTicksLengthMode="0" annotationExpression="" intervalX="0" bottomAnnotationPosition="1" rightAnnotationDisplay="0" rotatedAnnotationsMinimumAngle="0" annotationPrecision="3" frameFillColor1="255,255,255,255" blendMode="0" offsetY="0" gridFrameWidth="2" leftAnnotationDisplay="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" rotatedAnnotationsMarginToCorner="0" topFrameDivisions="0" topAnnotationDirection="0" rightAnnotationPosition="1" rotatedTicksMarginToCorner="0" gridStyle="0" minimumIntervalWidth="50" intervalY="0" unit="0" maximumIntervalWidth="100" gridFrameSideFlags="15" frameAnnotationDistance="1" frameFillColor2="0,0,0,255" rightAnnotationDirection="0" position="3" bottomAnnotationDisplay="0" leftAnnotationPosition="1" rotatedAnnotationsLengthMode="0" annotationFormat="0" gridFramePenColor="0,0,0,255" leftAnnotationDirection="0" rightFrameDivisions="0" bottomAnnotationDirection="0" offsetX="0">
+        <ComposerMapGrid bottomAnnotationPosition="1" frameFillColor2="0,0,0,255" blendMode="0" bottomAnnotationDisplay="0" name="Grid 1" frameFillColor1="255,255,255,255" position="3" bottomFrameDivisions="0" topAnnotationPosition="1" crossLength="3" leftAnnotationDisplay="0" intervalY="0" rotatedAnnotationsMarginToCorner="0" gridFrameStyle="0" annotationFormat="0" topAnnotationDirection="0" leftFrameDivisions="0" topFrameDivisions="0" annotationPrecision="3" rotatedTicksMinimumAngle="0" rightFrameDivisions="0" maximumIntervalWidth="100" unit="0" rotatedTicksEnabled="0" topAnnotationDisplay="0" leftAnnotationPosition="1" show="0" rotatedTicksMarginToCorner="0" rotatedTicksLengthMode="0" gridStyle="0" rotatedAnnotationsMinimumAngle="0" minimumIntervalWidth="50" bottomAnnotationDirection="0" annotationExpression="" intervalX="0" offsetY="0" offsetX="0" gridFramePenColor="0,0,0,255" gridFrameMargin="0" gridFrameWidth="2" rightAnnotationDisplay="0" rotatedAnnotationsEnabled="0" leftAnnotationDirection="0" rightAnnotationDirection="0" gridFrameSideFlags="15" gridFramePenThickness="0.5" showAnnotation="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" rightAnnotationPosition="1" frameAnnotationDistance="1" rotatedAnnotationsLengthMode="0">
           <lineStyle>
-            <symbol is_animated="0" type="line" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <symbol alpha="1" type="line" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleLine" enabled="1">
+              <layer locked="0" class="SimpleLine" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="align_dash_pattern"/>
-                  <Option value="square" type="QString" name="capstyle"/>
-                  <Option value="5;2" type="QString" name="customdash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="customdash_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="customdash_unit"/>
-                  <Option value="0" type="QString" name="dash_pattern_offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="dash_pattern_offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="dash_pattern_offset_unit"/>
-                  <Option value="0" type="QString" name="draw_inside_polygon"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0,0,255" type="QString" name="line_color"/>
-                  <Option value="solid" type="QString" name="line_style"/>
-                  <Option value="0" type="QString" name="line_width"/>
-                  <Option value="MM" type="QString" name="line_width_unit"/>
-                  <Option value="0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0" type="QString" name="ring_filter"/>
-                  <Option value="0" type="QString" name="trim_distance_end"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_end_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_end_unit"/>
-                  <Option value="0" type="QString" name="trim_distance_start"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="trim_distance_start_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="trim_distance_start_unit"/>
-                  <Option value="0" type="QString" name="tweak_dash_pattern_on_corners"/>
-                  <Option value="0" type="QString" name="use_custom_dash"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="width_map_unit_scale"/>
+                  <Option type="QString" value="0" name="align_dash_pattern"/>
+                  <Option type="QString" value="square" name="capstyle"/>
+                  <Option type="QString" value="5;2" name="customdash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="customdash_unit"/>
+                  <Option type="QString" value="0" name="dash_pattern_offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="dash_pattern_offset_unit"/>
+                  <Option type="QString" value="0" name="draw_inside_polygon"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0,0,255" name="line_color"/>
+                  <Option type="QString" value="solid" name="line_style"/>
+                  <Option type="QString" value="0" name="line_width"/>
+                  <Option type="QString" value="MM" name="line_width_unit"/>
+                  <Option type="QString" value="0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0" name="ring_filter"/>
+                  <Option type="QString" value="0" name="trim_distance_end"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_end_unit"/>
+                  <Option type="QString" value="0" name="trim_distance_start"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="trim_distance_start_unit"/>
+                  <Option type="QString" value="0" name="tweak_dash_pattern_on_corners"/>
+                  <Option type="QString" value="0" name="use_custom_dash"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="width_map_unit_scale"/>
                 </Option>
                 <prop k="align_dash_pattern" v="0"/>
                 <prop k="capstyle" v="square"/>
@@ -34450,44 +34540,44 @@ def my_form_open(dialog, layer, feature):
                 <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol is_animated="0" type="marker" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <symbol alpha="1" type="marker" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleMarker" enabled="1">
+              <layer locked="0" class="SimpleMarker" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="0" type="QString" name="angle"/>
-                  <Option value="square" type="QString" name="cap_style"/>
-                  <Option value="0,0,0,255" type="QString" name="color"/>
-                  <Option value="1" type="QString" name="horizontal_anchor_point"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="circle" type="QString" name="name"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="0,0,0,255" type="QString" name="outline_color"/>
-                  <Option value="solid" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="diameter" type="QString" name="scale_method"/>
-                  <Option value="2" type="QString" name="size"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="size_unit"/>
-                  <Option value="1" type="QString" name="vertical_anchor_point"/>
+                  <Option type="QString" value="0" name="angle"/>
+                  <Option type="QString" value="square" name="cap_style"/>
+                  <Option type="QString" value="0,0,0,255" name="color"/>
+                  <Option type="QString" value="1" name="horizontal_anchor_point"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="circle" name="name"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="0,0,0,255" name="outline_color"/>
+                  <Option type="QString" value="solid" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="diameter" name="scale_method"/>
+                  <Option type="QString" value="2" name="size"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="size_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="size_unit"/>
+                  <Option type="QString" value="1" name="vertical_anchor_point"/>
                 </Option>
                 <prop k="angle" v="0"/>
                 <prop k="cap_style" v="square"/>
@@ -34510,40 +34600,40 @@ def my_form_open(dialog, layer, feature):
                 <prop k="vertical_anchor_point" v="1"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="50" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="1" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="10" namedStyle="" forcedItalic="0" fontSizeUnit="Point" allowHtml="0">
+          <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="" fontUnderline="0" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" fontWeight="50" fontStrikeout="0" fontItalic="0" fontSize="10" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" textOrientation="horizontal">
             <families/>
-            <text-buffer bufferNoFill="1" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="1.5"/>
-            <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeBorderWidth="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-              <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+            <text-buffer bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+            <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskType="0"/>
+            <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
+              <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+                <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                   <Option type="Map">
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                    <Option value="255,255,255,255" type="QString" name="color"/>
-                    <Option value="bevel" type="QString" name="joinstyle"/>
-                    <Option value="0,0" type="QString" name="offset"/>
-                    <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                    <Option value="MM" type="QString" name="offset_unit"/>
-                    <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                    <Option value="no" type="QString" name="outline_style"/>
-                    <Option value="0" type="QString" name="outline_width"/>
-                    <Option value="MM" type="QString" name="outline_width_unit"/>
-                    <Option value="solid" type="QString" name="style"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                    <Option type="QString" value="255,255,255,255" name="color"/>
+                    <Option type="QString" value="bevel" name="joinstyle"/>
+                    <Option type="QString" value="0,0" name="offset"/>
+                    <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                    <Option type="QString" value="MM" name="offset_unit"/>
+                    <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                    <Option type="QString" value="no" name="outline_style"/>
+                    <Option type="QString" value="0" name="outline_width"/>
+                    <Option type="QString" value="MM" name="outline_width_unit"/>
+                    <Option type="QString" value="solid" name="style"/>
                   </Option>
                   <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                   <prop k="color" v="255,255,255,255"/>
@@ -34558,29 +34648,29 @@ def my_form_open(dialog, layer, feature):
                   <prop k="style" v="solid"/>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" type="QString" name="name"/>
+                      <Option type="QString" value="" name="name"/>
                       <Option name="properties"/>
-                      <Option value="collection" type="QString" name="type"/>
+                      <Option type="QString" value="collection" name="type"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </background>
-            <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+            <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
             <dd_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dd_properties>
           </text-style>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
@@ -34588,56 +34678,56 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
+        <AtlasMap margin="0.10000000000000001" scalingMode="2" atlasDriven="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" enabled="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clipSource="" enabled="0" clippingType="0"/>
+        <itemClippingSettings clipSource="" forceLabelsInside="0" clippingType="0" enabled="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" type="QString" name="atlasRasterFormat"/>
-          <Option value="0" type="QString" name="forceVector"/>
-          <Option value="true" type="QString" name="imageAntialias"/>
-          <Option value="0" type="QString" name="imageCropMarginBottom"/>
-          <Option value="0" type="QString" name="imageCropMarginLeft"/>
-          <Option value="0" type="QString" name="imageCropMarginRight"/>
-          <Option value="0" type="QString" name="imageCropMarginTop"/>
-          <Option value="false" type="QString" name="imageCropToContents"/>
-          <Option value="0" type="QString" name="pdfDisableRasterTiles"/>
-          <Option value="1" type="QString" name="pdfIncludeMetadata"/>
-          <Option value="0" type="QString" name="pdfTextFormat"/>
-          <Option value="false" type="QString" name="singleFile"/>
+          <Option type="QString" value="png" name="atlasRasterFormat"/>
+          <Option type="QString" value="0" name="forceVector"/>
+          <Option type="QString" value="true" name="imageAntialias"/>
+          <Option type="QString" value="0" name="imageCropMarginBottom"/>
+          <Option type="QString" value="0" name="imageCropMarginLeft"/>
+          <Option type="QString" value="0" name="imageCropMarginRight"/>
+          <Option type="QString" value="0" name="imageCropMarginTop"/>
+          <Option type="QString" value="false" name="imageCropToContents"/>
+          <Option type="QString" value="0" name="pdfDisableRasterTiles"/>
+          <Option type="QString" value="1" name="pdfIncludeMetadata"/>
+          <Option type="QString" value="0" name="pdfTextFormat"/>
+          <Option type="QString" value="false" name="singleFile"/>
         </Option>
       </customproperties>
-      <Atlas hideCoverage="1" pageNameExpression="&quot;FID&quot;" sortFeatures="0" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" coverageLayerName="residents_access" filterFeatures="0" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" coverageLayerProvider="ogr" enabled="0"/>
+      <Atlas filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" filterFeatures="0" hideCoverage="1" enabled="0" coverageLayerProvider="ogr" pageNameExpression="&quot;FID&quot;" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" coverageLayerName="residents_access" sortFeatures="0"/>
     </Layout>
-    <Layout name="Marshal Plan" printResolution="120" worldFileMap="" units="mm">
-      <Snapper snapToItems="1" snapToGuides="1" tolerance="5" snapToGrid="0"/>
-      <Grid resUnits="mm" offsetUnits="mm" offsetY="0" offsetX="0" resolution="10"/>
+    <Layout units="mm" printResolution="120" worldFileMap="" name="Marshal Plan">
+      <Snapper snapToGuides="1" tolerance="5" snapToGrid="0" snapToItems="1"/>
+      <Grid resolution="10" offsetY="0" offsetX="0" offsetUnits="mm" resUnits="mm"/>
       <PageCollection>
-        <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+        <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="255,255,255,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="no" type="QString" name="outline_style"/>
-              <Option value="0.26" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+              <Option type="QString" value="255,255,255,255" name="color"/>
+              <Option type="QString" value="miter" name="joinstyle"/>
+              <Option type="QString" value="0,0" name="offset"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+              <Option type="QString" value="MM" name="offset_unit"/>
+              <Option type="QString" value="0,0,0,255" name="outline_color"/>
+              <Option type="QString" value="no" name="outline_style"/>
+              <Option type="QString" value="0.26" name="outline_width"/>
+              <Option type="QString" value="MM" name="outline_width_unit"/>
+              <Option type="QString" value="solid" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="255,255,255,255"/>
@@ -34652,49 +34742,49 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem outlineWidthM="0.3,mm" groupUuid="" position="0,0,mm" positionLock="false" templateUuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" uuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" type="65638" blendMode="0" size="297,420,mm" opacity="1" visibility="1" referencePoint="0" id="" frame="false" zValue="0" frameJoinStyle="miter" positionOnPage="0,0,mm" background="true" excludeFromExports="0" itemRotation="0">
-          <FrameColor red="0" green="0" blue="0" alpha="255"/>
-          <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+        <LayoutItem referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" groupUuid="" positionOnPage="0,0,mm" positionLock="false" frameJoinStyle="miter" frame="false" type="65638" outlineWidthM="0.3,mm" templateUuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" background="true" size="297,420,mm" zValue="0" uuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" opacity="1" position="0,0,mm" excludeFromExports="0">
+          <FrameColor alpha="255" red="0" blue="0" green="0"/>
+          <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </dataDefinedProperties>
             <customproperties>
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+            <layer locked="0" class="SimpleFill" enabled="1" pass="0">
               <Option type="Map">
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                <Option value="255,255,255,255" type="QString" name="color"/>
-                <Option value="miter" type="QString" name="joinstyle"/>
-                <Option value="0,0" type="QString" name="offset"/>
-                <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                <Option value="MM" type="QString" name="offset_unit"/>
-                <Option value="35,35,35,255" type="QString" name="outline_color"/>
-                <Option value="no" type="QString" name="outline_style"/>
-                <Option value="0.26" type="QString" name="outline_width"/>
-                <Option value="MM" type="QString" name="outline_width_unit"/>
-                <Option value="solid" type="QString" name="style"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                <Option type="QString" value="255,255,255,255" name="color"/>
+                <Option type="QString" value="miter" name="joinstyle"/>
+                <Option type="QString" value="0,0" name="offset"/>
+                <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                <Option type="QString" value="MM" name="offset_unit"/>
+                <Option type="QString" value="35,35,35,255" name="outline_color"/>
+                <Option type="QString" value="no" name="outline_style"/>
+                <Option type="QString" value="0.26" name="outline_width"/>
+                <Option type="QString" value="MM" name="outline_width_unit"/>
+                <Option type="QString" value="solid" name="style"/>
               </Option>
               <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
               <prop k="color" v="255,255,255,255"/>
@@ -34709,9 +34799,9 @@ def my_form_open(dialog, layer, feature):
               <prop k="style" v="solid"/>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -34719,47 +34809,47 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem outlineWidthM="0.3,mm" valign="32" groupUuid="" position="112.086,406.476,mm" positionLock="true" templateUuid="{e80a7a81-88a9-4e36-a24b-3fc8125e32e9}" uuid="{e80a7a81-88a9-4e36-a24b-3fc8125e32e9}" type="65641" blendMode="0" size="23.5967,8.3142,mm" opacity="1" visibility="1" htmlState="1" referencePoint="0" marginX="0" id="" halign="4" frame="false" zValue="14" labelText="Page [% &quot;page&quot; %] " frameJoinStyle="miter" positionOnPage="112.086,406.476,mm" background="false" marginY="1" excludeFromExports="0" itemRotation="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem marginY="1" referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" htmlState="1" groupUuid="" positionOnPage="112.086,406.476,mm" positionLock="true" frameJoinStyle="miter" frame="false" type="65641" outlineWidthM="0.3,mm" templateUuid="{e80a7a81-88a9-4e36-a24b-3fc8125e32e9}" background="false" size="23.5967,8.3142,mm" labelText="Page [% &quot;page&quot; %] " zValue="14" uuid="{e80a7a81-88a9-4e36-a24b-3fc8125e32e9}" opacity="1" position="112.086,406.476,mm" marginX="0" halign="4" valign="32" excludeFromExports="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="50" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="1" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="12" namedStyle="" forcedItalic="0" fontSizeUnit="Point" allowHtml="0">
+        <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="" fontUnderline="0" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" fontWeight="50" fontStrikeout="0" fontItalic="0" fontSize="12" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferNoFill="1" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="1.5"/>
-          <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeBorderWidth="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <text-buffer bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
+            <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -34774,33 +34864,33 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem rasterBorderWidth="0" outlineWidthM="0.3,mm" maxSymbolSize="0" rasterBorderColor="0,0,0,255" frameJoinStyle="miter" excludeFromExports="0" title="" columnCount="1" background="true" rasterBorder="1" boxSpace="2" size="21.6797,33,mm" map_uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" legendFilterByAtlas="0" wmsLegendHeight="25" columnSpace="2" type="65642" symbolAlignment="1" id="" positionLock="true" blendMode="0" positionOnPage="15.6525,12.5708,mm" splitLayer="0" resizeToContents="1" templateUuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" frame="false" opacity="1" uuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" minSymbolSize="0" fontColor="#000000" lineSpacing="1" referencePoint="0" visibility="1" wrapChar="" itemRotation="0" symbolWidth="7" wmsLegendWidth="50" groupUuid="" position="15.6525,12.5708,mm" symbolHeight="4" equalColumnWidth="1" titleAlignment="1" zValue="8">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem splitLayer="0" size="21.6797,33,mm" legendFilterByAtlas="0" boxSpace="2" templateUuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" blendMode="0" maxSymbolSize="0" position="15.6525,12.5708,mm" groupUuid="" wrapChar="" minSymbolSize="0" referencePoint="0" symbolAlignment="1" itemRotation="0" title="" equalColumnWidth="1" resizeToContents="1" wmsLegendHeight="25" columnCount="1" outlineWidthM="0.3,mm" rasterBorder="1" background="true" visibility="1" symbolHeight="4" fontColor="#000000" positionLock="true" zValue="8" titleAlignment="1" lineSpacing="1" columnSpace="2" id="" rasterBorderColor="0,0,0,255" positionOnPage="15.6525,12.5708,mm" excludeFromExports="0" rasterBorderWidth="0" type="65642" wmsLegendWidth="50" uuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" opacity="1" frame="false" symbolWidth="7" map_uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" frameJoinStyle="miter">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -34808,37 +34898,37 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style name="title" indent="0" alignment="1">
-            <styleFont bold="0" style="" italic="0" description="Myriad Pro,16,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0"/>
+          <style indent="0" alignment="1" name="title">
+            <styleFont style="" description="Myriad Pro,16,-1,5,50,0,0,0,0,0" strikethrough="0" italic="0" underline="0" bold="0"/>
           </style>
-          <style name="group" indent="0" alignment="1">
-            <styleFont bold="1" style="Semibold" italic="0" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" underline="0" strikethrough="0"/>
+          <style indent="0" alignment="1" name="group">
+            <styleFont style="Semibold" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0" italic="0" underline="0" bold="1"/>
           </style>
-          <style name="subgroup" indent="0" alignment="1" marginTop="1">
-            <styleFont bold="1" style="Semibold" italic="0" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" underline="0" strikethrough="0"/>
+          <style marginTop="1" indent="0" alignment="1" name="subgroup">
+            <styleFont style="Semibold" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0" italic="0" underline="0" bold="1"/>
           </style>
-          <style name="symbol" indent="0" alignment="1" marginTop="2">
-            <styleFont bold="0" style="" italic="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0"/>
+          <style marginTop="2" indent="0" alignment="1" name="symbol">
+            <styleFont style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0" strikethrough="0" italic="0" underline="0" bold="0"/>
           </style>
-          <style marginLeft="2" name="symbolLabel" indent="0" alignment="1" marginTop="2">
-            <styleFont bold="1" style="Semibold" italic="0" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" underline="0" strikethrough="0"/>
+          <style marginTop="2" marginLeft="2" indent="0" alignment="1" name="symbolLabel">
+            <styleFont style="Semibold" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0" italic="0" underline="0" bold="1"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group checked="Qt::Checked" name="Routes" groupLayer="" expanded="1">
+          <layer-tree-group expanded="1" groupLayer="" checked="Qt::Checked" name="Routes">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer checked="Qt::Checked" legend_exp="" source="./all_routes.shp|layername=all_routes" name="all_routes" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" providerKey="ogr" legend_split_behavior="0" patch_size="0,0" expanded="1">
+            <layer-tree-layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" expanded="1" legend_split_behavior="0" source="./all_routes.shp|layername=all_routes" legend_exp="" providerKey="ogr" patch_size="0,0" checked="Qt::Checked" name="all_routes">
               <customproperties>
                 <Option type="Map">
                   <Option type="invalid" name="expandedLegendNodes"/>
-                  <Option value="1,2,3,4" type="QString" name="legend/node-order"/>
-                  <Option value="hidden" type="QString" name="legend/title-style"/>
-                  <Option value="0" type="int" name="showFeatureCount"/>
+                  <Option type="QString" value="1,2,3,4" name="legend/node-order"/>
+                  <Option type="QString" value="hidden" name="legend/title-style"/>
+                  <Option type="int" value="0" name="showFeatureCount"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -34846,47 +34936,47 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" valign="64" groupUuid="" position="5.69321,398.344,mm" positionLock="true" templateUuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" uuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" type="65641" blendMode="0" size="45.1194,8.13137,mm" opacity="1" visibility="1" htmlState="0" referencePoint="0" marginX="0" id="" halign="1" frame="false" zValue="7" labelText="MARSHAL POSITIONS" frameJoinStyle="miter" positionOnPage="5.69321,398.344,mm" background="false" marginY="1" excludeFromExports="0" itemRotation="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem marginY="1" referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" htmlState="0" groupUuid="" positionOnPage="5.69321,398.344,mm" positionLock="true" frameJoinStyle="miter" frame="false" type="65641" outlineWidthM="0.3,mm" templateUuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" background="false" size="45.1194,8.13137,mm" labelText="MARSHAL POSITIONS" zValue="7" uuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" opacity="1" position="5.69321,398.344,mm" marginX="0" halign="1" valign="64" excludeFromExports="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="63" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="1" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="12" namedStyle="" forcedItalic="0" fontSizeUnit="Point" allowHtml="0">
+        <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="" fontUnderline="0" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" fontWeight="63" fontStrikeout="0" fontItalic="0" fontSize="12" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferNoFill="1" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="1.5"/>
-          <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeBorderWidth="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <text-buffer bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
+            <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -34901,65 +34991,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" valign="32" groupUuid="" position="5.69321,406.988,mm" positionLock="true" templateUuid="{e68b6800-4c3f-494c-8bb8-5995b9419664}" uuid="{e68b6800-4c3f-494c-8bb8-5995b9419664}" type="65641" blendMode="0" size="118.192,7.80192,mm" opacity="1" visibility="1" htmlState="1" referencePoint="0" marginX="0" id="" halign="1" frame="false" zValue="6" 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>" frameJoinStyle="miter" positionOnPage="5.69321,406.988,mm" background="false" marginY="1" excludeFromExports="0" itemRotation="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem marginY="1" referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" htmlState="1" groupUuid="" positionOnPage="5.69321,406.988,mm" positionLock="true" frameJoinStyle="miter" frame="false" type="65641" outlineWidthM="0.3,mm" templateUuid="{e68b6800-4c3f-494c-8bb8-5995b9419664}" background="false" size="118.192,7.80192,mm" 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>" zValue="6" uuid="{e68b6800-4c3f-494c-8bb8-5995b9419664}" opacity="1" position="5.69321,406.988,mm" marginX="0" halign="1" valign="32" excludeFromExports="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="50" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="1" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="12" namedStyle="" forcedItalic="0" fontSizeUnit="Point" allowHtml="0">
+        <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="" fontUnderline="0" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" fontWeight="50" fontStrikeout="0" fontItalic="0" fontSize="12" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferNoFill="1" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="1.5"/>
-          <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeBorderWidth="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <text-buffer bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
+            <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -34974,65 +35064,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" valign="32" groupUuid="" position="214.292,406.874,mm" positionLock="true" templateUuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" uuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" type="65641" blendMode="0" size="27.7839,7.51682,mm" opacity="1" visibility="1" htmlState="0" referencePoint="0" marginX="0" id="" halign="2" frame="false" zValue="5" labelText="REVISION 3.0" frameJoinStyle="miter" positionOnPage="214.292,406.874,mm" background="false" marginY="1" excludeFromExports="0" itemRotation="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem marginY="1" referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" htmlState="0" groupUuid="" positionOnPage="214.292,406.874,mm" positionLock="true" frameJoinStyle="miter" frame="false" type="65641" outlineWidthM="0.3,mm" templateUuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" background="false" size="27.7839,7.51682,mm" labelText="REVISION 3.0" zValue="5" uuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" opacity="1" position="214.292,406.874,mm" marginX="0" halign="2" valign="32" excludeFromExports="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="50" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="1" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="12" namedStyle="" forcedItalic="0" fontSizeUnit="Point" allowHtml="0">
+        <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="" fontUnderline="0" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" fontWeight="50" fontStrikeout="0" fontItalic="0" fontSize="12" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferNoFill="1" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="1.5"/>
-          <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeBorderWidth="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <text-buffer bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
+            <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -35047,65 +35137,65 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" valign="64" groupUuid="" position="148.501,398.344,mm" positionLock="true" templateUuid="{dff19ea3-9875-466a-9e36-833d5f362e9c}" uuid="{dff19ea3-9875-466a-9e36-833d5f362e9c}" type="65641" blendMode="0" size="93.5757,8.13167,mm" opacity="1" visibility="1" htmlState="1" referencePoint="0" marginX="0" id="" halign="2" frame="false" zValue="4" 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>" frameJoinStyle="miter" positionOnPage="148.501,398.344,mm" background="false" marginY="1" excludeFromExports="0" itemRotation="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem marginY="1" referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" htmlState="1" groupUuid="" positionOnPage="148.501,398.344,mm" positionLock="true" frameJoinStyle="miter" frame="false" type="65641" outlineWidthM="0.3,mm" templateUuid="{dff19ea3-9875-466a-9e36-833d5f362e9c}" background="false" size="93.5757,8.13167,mm" 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>" zValue="4" uuid="{dff19ea3-9875-466a-9e36-833d5f362e9c}" opacity="1" position="148.501,398.344,mm" marginX="0" halign="2" valign="64" excludeFromExports="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontFamily="Myriad Pro" forcedBold="0" fontWeight="50" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" textColor="0,0,0,255" textOpacity="1" fontStrikeout="0" blendMode="0" fontUnderline="0" fontKerning="1" capitalization="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" textOrientation="horizontal" fontItalic="0" multilineHeight="1" fontSize="12" namedStyle="" forcedItalic="0" fontSizeUnit="Point" allowHtml="0">
+        <text-style textOpacity="1" forcedBold="0" fontLetterSpacing="0" fontSizeUnit="Point" blendMode="0" namedStyle="" fontUnderline="0" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontWordSpacing="0" forcedItalic="0" fontWeight="50" fontStrikeout="0" fontItalic="0" fontSize="12" allowHtml="0" fontKerning="1" textColor="0,0,0,255" fontFamily="Myriad Pro" capitalization="0" textOrientation="horizontal">
           <families/>
-          <text-buffer bufferNoFill="1" bufferBlendMode="0" bufferSize="1" bufferJoinStyle="128" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferOpacity="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskType="0" maskEnabled="0" maskSize="1.5"/>
-          <background shapeRadiiY="0" shapeSizeType="0" shapeBlendMode="0" shapeRotation="0" shapeSVGFile="" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeY="0" shapeFillColor="255,255,255,255" shapeDraw="0" shapeBorderWidth="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeSizeX="0" shapeType="0" shapeJoinStyle="64" shapeOffsetUnit="MM" shapeBorderColor="128,128,128,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeOpacity="1" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeSizeUnit="MM" shapeRadiiX="0" shapeRadiiUnit="MM" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0">
-            <symbol is_animated="0" type="fill" name="fillSymbol" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+          <text-buffer bufferNoFill="1" bufferJoinStyle="128" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1"/>
+          <text-mask maskEnabled="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskSize="1.5" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRadiiY="0" shapeOffsetY="0" shapeSVGFile="" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeRotationType="0" shapeSizeX="0" shapeDraw="0" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOffsetX="0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeBlendMode="0" shapeBorderWidth="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSizeUnit="MM" shapeFillColor="255,255,255,255" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
+            <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="fillSymbol">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" type="QString" name="name"/>
+                  <Option type="QString" value="" name="name"/>
                   <Option name="properties"/>
-                  <Option value="collection" type="QString" name="type"/>
+                  <Option type="QString" value="collection" name="type"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+              <layer locked="0" class="SimpleFill" enabled="1" pass="0">
                 <Option type="Map">
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-                  <Option value="255,255,255,255" type="QString" name="color"/>
-                  <Option value="bevel" type="QString" name="joinstyle"/>
-                  <Option value="0,0" type="QString" name="offset"/>
-                  <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-                  <Option value="MM" type="QString" name="offset_unit"/>
-                  <Option value="128,128,128,255" type="QString" name="outline_color"/>
-                  <Option value="no" type="QString" name="outline_style"/>
-                  <Option value="0" type="QString" name="outline_width"/>
-                  <Option value="MM" type="QString" name="outline_width_unit"/>
-                  <Option value="solid" type="QString" name="style"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+                  <Option type="QString" value="255,255,255,255" name="color"/>
+                  <Option type="QString" value="bevel" name="joinstyle"/>
+                  <Option type="QString" value="0,0" name="offset"/>
+                  <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+                  <Option type="QString" value="MM" name="offset_unit"/>
+                  <Option type="QString" value="128,128,128,255" name="outline_color"/>
+                  <Option type="QString" value="no" name="outline_style"/>
+                  <Option type="QString" value="0" name="outline_width"/>
+                  <Option type="QString" value="MM" name="outline_width_unit"/>
+                  <Option type="QString" value="solid" name="style"/>
                 </Option>
                 <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                 <prop k="color" v="255,255,255,255"/>
@@ -35120,39 +35210,39 @@ def my_form_open(dialog, layer, feature):
                 <prop k="style" v="solid"/>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" type="QString" name="name"/>
+                    <Option type="QString" value="" name="name"/>
                     <Option name="properties"/>
-                    <Option value="collection" type="QString" name="type"/>
+                    <Option type="QString" value="collection" name="type"/>
                   </Option>
                 </data_defined_properties>
               </layer>
             </symbol>
           </background>
-          <shadow shadowRadius="1.5" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowOffsetGlobal="1" shadowScale="100" shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowUnder="0" shadowBlendMode="6" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0"/>
+          <shadow shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetDist="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowUnder="0" shadowRadiusUnit="MM" shadowScale="100" shadowOpacity="0.69999999999999996" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowDraw="0"/>
           <dd_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" groupUuid="" position="243.319,382.696,mm" anchorPoint="8" positionLock="true" svgFillColor="255,255,255,255" templateUuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" uuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" type="65640" blendMode="0" size="49.3143,31.2967,mm" opacity="1" visibility="1" svgBorderColor="0,0,0,255" northMode="0" northOffset="0" referencePoint="0" id="" frame="false" zValue="3" mode="1" frameJoinStyle="miter" resizeMode="0" positionOnPage="243.319,382.696,mm" file="../GunRun2022_250.png" svgBorderWidth="0.2" pictureRotation="0" background="false" pictureHeight="26.4325" pictureWidth="49.3143" excludeFromExports="0" itemRotation="0" mapUuid="">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" mapUuid="" svgBorderWidth="0.2" pictureHeight="26.4325" groupUuid="" positionOnPage="243.319,382.696,mm" positionLock="true" frameJoinStyle="miter" mode="1" frame="false" type="65640" outlineWidthM="0.3,mm" resizeMode="0" file="../GunRun2022_250.png" northOffset="0" templateUuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" background="false" svgFillColor="255,255,255,255" pictureRotation="0" size="49.3143,31.2967,mm" zValue="3" uuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" svgBorderColor="0,0,0,255" northMode="0" opacity="1" position="243.319,382.696,mm" excludeFromExports="0" pictureWidth="49.3143" anchorPoint="8">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedSource">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="expression"/>
-                  <Option value="3" type="int" name="type"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -35160,42 +35250,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" groupUuid="" position="5.84321,406.626,mm" positionLock="true" templateUuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" uuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" type="65643" blendMode="0" size="236.083,0.14328,mm" opacity="1" visibility="1" referencePoint="0" id="" frame="false" zValue="2" shapeType="1" cornerRadiusMeasure="0,mm" frameJoinStyle="miter" positionOnPage="5.84321,406.626,mm" background="false" excludeFromExports="0" itemRotation="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" groupUuid="" positionOnPage="5.84321,406.626,mm" positionLock="true" frameJoinStyle="miter" frame="false" type="65643" outlineWidthM="0.3,mm" shapeType="1" cornerRadiusMeasure="0,mm" templateUuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" background="false" size="236.083,0.14328,mm" zValue="2" uuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" opacity="1" position="5.84321,406.626,mm" excludeFromExports="0">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol is_animated="0" type="fill" name="" clip_to_extent="1" alpha="1" force_rhr="0" frame_rate="10">
+        <symbol alpha="1" type="fill" force_rhr="0" clip_to_extent="1" is_animated="0" frame_rate="10" name="">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option name="properties"/>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" class="SimpleFill" enabled="1">
+          <layer locked="0" class="SimpleFill" enabled="1" pass="0">
             <Option type="Map">
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="border_width_map_unit_scale"/>
-              <Option value="0,0,0,255" type="QString" name="color"/>
-              <Option value="miter" type="QString" name="joinstyle"/>
-              <Option value="0,0" type="QString" name="offset"/>
-              <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
-              <Option value="MM" type="QString" name="offset_unit"/>
-              <Option value="0,0,0,255" type="QString" name="outline_color"/>
-              <Option value="solid" type="QString" name="outline_style"/>
-              <Option value="0.3" type="QString" name="outline_width"/>
-              <Option value="MM" type="QString" name="outline_width_unit"/>
-              <Option value="solid" type="QString" name="style"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="border_width_map_unit_scale"/>
+              <Option type="QString" value="0,0,0,255" name="color"/>
+              <Option type="QString" value="miter" name="joinstyle"/>
+              <Option type="QString" value="0,0" name="offset"/>
+              <Option type="QString" value="3x:0,0,0,0,0,0" name="offset_map_unit_scale"/>
+              <Option type="QString" value="MM" name="offset_unit"/>
+              <Option type="QString" value="0,0,0,255" name="outline_color"/>
+              <Option type="QString" value="solid" name="outline_style"/>
+              <Option type="QString" value="0.3" name="outline_width"/>
+              <Option type="QString" value="MM" name="outline_width_unit"/>
+              <Option type="QString" value="solid" name="style"/>
             </Option>
             <prop k="border_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
             <prop k="color" v="0,0,0,255"/>
@@ -35210,78 +35300,78 @@ def my_form_open(dialog, layer, feature):
             <prop k="style" v="solid"/>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" type="QString" name="name"/>
+                <Option type="QString" value="" name="name"/>
                 <Option name="properties"/>
-                <Option value="collection" type="QString" name="type"/>
+                <Option type="QString" value="collection" name="type"/>
               </Option>
             </data_defined_properties>
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" groupUuid="" position="5.03,5.9483,mm" positionLock="true" templateUuid="{8ff439cd-f9a2-4318-a778-a55335437202}" uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" type="65639" blendMode="0" followPresetName="Marshal overview" keepLayerSet="false" size="286.94,392.396,mm" opacity="1" visibility="1" referencePoint="0" id="" frame="false" followPreset="true" zValue="1" frameJoinStyle="miter" labelMargin="0,mm" positionOnPage="5.03,5.9483,mm" mapRotation="0" background="true" excludeFromExports="0" itemRotation="0" drawCanvasItems="false" mapFlags="0" isTemporal="0">
-        <FrameColor red="0" green="0" blue="0" alpha="255"/>
-        <BackgroundColor red="255" green="255" blue="255" alpha="255"/>
+      <LayoutItem referencePoint="0" blendMode="0" itemRotation="0" id="" visibility="1" drawCanvasItems="false" mapRotation="0" mapFlags="0" groupUuid="" positionOnPage="5.03,5.9483,mm" positionLock="true" frameJoinStyle="miter" followPresetName="Marshal overview" frame="false" type="65639" outlineWidthM="0.3,mm" labelMargin="0,mm" templateUuid="{8ff439cd-f9a2-4318-a778-a55335437202}" background="true" size="286.94,392.396,mm" zValue="1" uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" opacity="1" position="5.03,5.9483,mm" keepLayerSet="false" excludeFromExports="0" isTemporal="0" followPreset="true">
+        <FrameColor alpha="255" red="0" blue="0" green="0"/>
+        <BackgroundColor alpha="255" red="255" blue="255" green="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" type="QString" name="name"/>
+              <Option type="QString" value="" name="name"/>
               <Option type="Map" name="properties">
                 <Option type="Map" name="dataDefinedMapScale">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="field"/>
-                  <Option value="2" type="int" name="type"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="" name="field"/>
+                  <Option type="int" value="2" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapXMin">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="field"/>
-                  <Option value="2" type="int" name="type"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="" name="field"/>
+                  <Option type="int" value="2" name="type"/>
                 </Option>
                 <Option type="Map" name="dataDefinedMapYMin">
-                  <Option value="false" type="bool" name="active"/>
-                  <Option value="" type="QString" name="field"/>
-                  <Option value="2" type="int" name="type"/>
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="" name="field"/>
+                  <Option type="int" value="2" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" type="QString" name="type"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmin="18.36924763341120581" ymax="-33.9248732774534929" ymin="-33.94797288016832226" xmax="18.38613924055453452"/>
+        <Extent ymax="-33.9248732774534929" xmin="18.36924763341120581" ymin="-33.94797288016832226" xmax="18.38613924055453452"/>
         <LayerSet/>
-        <AtlasMap margin="0" atlasDriven="1" scalingMode="2"/>
+        <AtlasMap margin="0" scalingMode="2" atlasDriven="1"/>
         <labelBlockingItems/>
-        <atlasClippingSettings forceLabelsInside="0" restrictLayers="0" enabled="0" clippingType="0">
+        <atlasClippingSettings forceLabelsInside="0" clippingType="0" enabled="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings forceLabelsInside="0" clipSource="" enabled="0" clippingType="0"/>
+        <itemClippingSettings clipSource="" forceLabelsInside="0" clippingType="0" enabled="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" type="QString" name="atlasRasterFormat"/>
-          <Option value="0" type="int" name="forceVector"/>
-          <Option value="1" type="int" name="pdfAppendGeoreference"/>
-          <Option value="0" type="int" name="pdfCreateGeoPdf"/>
-          <Option value="0" type="int" name="pdfDisableRasterTiles"/>
-          <Option value="" type="QString" name="pdfExportThemes"/>
-          <Option value="1" type="int" name="pdfIncludeMetadata"/>
-          <Option value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~fence_groups_cbaea960_3348_4aea_b155_46e5d310f792~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~route_markers_7b072d1e_ad75_4233_a306_a6e83facfea1~~~route_markers_bb6f2b45_4e2f_4147_bb52_e7db21fcb1e7" type="QString" name="pdfLayerOrder"/>
-          <Option value="0" type="int" name="pdfLosslessImages"/>
-          <Option value="0" type="int" name="pdfOgcBestPracticeFormat"/>
-          <Option value="1" type="int" name="pdfSimplify"/>
-          <Option value="0" type="int" name="pdfTextFormat"/>
+          <Option type="QString" value="png" name="atlasRasterFormat"/>
+          <Option type="int" value="0" name="forceVector"/>
+          <Option type="int" value="1" name="pdfAppendGeoreference"/>
+          <Option type="int" value="0" name="pdfCreateGeoPdf"/>
+          <Option type="int" value="0" name="pdfDisableRasterTiles"/>
+          <Option type="QString" value="" name="pdfExportThemes"/>
+          <Option type="int" value="1" name="pdfIncludeMetadata"/>
+          <Option type="QString" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~fence_groups_cbaea960_3348_4aea_b155_46e5d310f792~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~route_markers_7b072d1e_ad75_4233_a306_a6e83facfea1~~~route_markers_bb6f2b45_4e2f_4147_bb52_e7db21fcb1e7" name="pdfLayerOrder"/>
+          <Option type="int" value="0" name="pdfLosslessImages"/>
+          <Option type="int" value="0" name="pdfOgcBestPracticeFormat"/>
+          <Option type="int" value="1" name="pdfSimplify"/>
+          <Option type="int" value="0" name="pdfTextFormat"/>
         </Option>
       </customproperties>
-      <Atlas hideCoverage="1" pageNameExpression="&quot;page&quot;" sortFeatures="1" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/marshal overviews.shp|layername=marshal overviews" filenamePattern="'output_'||@atlas_featurenumber" coverageLayerName="marshal_overviews" sortAscending="1" filterFeatures="0" coverageLayer="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" sortKey="page" coverageLayerProvider="ogr" enabled="1"/>
+      <Atlas sortKey="page" sortAscending="1" filenamePattern="'output_'||@atlas_featurenumber" coverageLayer="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" filterFeatures="0" hideCoverage="1" enabled="1" coverageLayerProvider="ogr" pageNameExpression="&quot;page&quot;" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/marshal overviews.shp|layername=marshal overviews" coverageLayerName="marshal_overviews" sortFeatures="1"/>
     </Layout>
   </Layouts>
   <mapViewDocks3D/>
   <Bookmarks/>
   <ProjectViewSettings UseProjectScales="0">
     <Scales/>
-    <DefaultViewExtent xmin="18.39483932596524696" ymax="-33.90119829484044089" ymin="-33.91746432349552265" xmax="18.42507820360838267">
+    <DefaultViewExtent ymax="-33.90225422560713753" xmin="18.35917421026181984" ymin="-33.94563030202068887" xmax="18.43981121731019357">
       <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>
@@ -35295,41 +35385,41 @@ def my_form_open(dialog, layer, feature):
       </spatialrefsys>
     </DefaultViewExtent>
   </ProjectViewSettings>
-  <ProjectStyleSettings projectStyleId="attachment:///QnVUUv_styles.db" RandomizeDefaultSymbolColor="1" DefaultSymbolOpacity="1">
+  <ProjectStyleSettings RandomizeDefaultSymbolColor="1" DefaultSymbolOpacity="1" projectStyleId="attachment:///QnVUUv_styles.db">
     <databases/>
   </ProjectStyleSettings>
-  <ProjectTimeSettings cumulativeTemporalRange="0" timeStepUnit="h" timeStep="1" frameRate="1"/>
+  <ProjectTimeSettings timeStepUnit="h" cumulativeTemporalRange="0" timeStep="1" frameRate="1"/>
   <ElevationProperties>
     <terrainProvider type="flat">
-      <TerrainProvider scale="1" offset="0"/>
+      <TerrainProvider offset="0" scale="1"/>
     </terrainProvider>
   </ElevationProperties>
   <ProjectDisplaySettings>
     <BearingFormat id="bearing">
       <Option type="Map">
-        <Option value="" type="QChar" name="decimal_separator"/>
-        <Option value="6" type="int" name="decimals"/>
-        <Option value="0" type="int" name="direction_format"/>
-        <Option value="0" type="int" name="rounding_type"/>
-        <Option value="false" type="bool" name="show_plus"/>
-        <Option value="true" type="bool" name="show_thousand_separator"/>
-        <Option value="false" type="bool" name="show_trailing_zeros"/>
-        <Option value="" type="QChar" name="thousand_separator"/>
+        <Option type="QChar" value="" name="decimal_separator"/>
+        <Option type="int" value="6" name="decimals"/>
+        <Option type="int" value="0" name="direction_format"/>
+        <Option type="int" value="0" name="rounding_type"/>
+        <Option type="bool" value="false" name="show_plus"/>
+        <Option type="bool" value="true" name="show_thousand_separator"/>
+        <Option type="bool" value="false" name="show_trailing_zeros"/>
+        <Option type="QChar" value="" name="thousand_separator"/>
       </Option>
     </BearingFormat>
     <GeographicCoordinateFormat id="geographiccoordinate">
       <Option type="Map">
-        <Option value="DecimalDegrees" type="QString" name="angle_format"/>
-        <Option value="" type="QChar" name="decimal_separator"/>
-        <Option value="6" type="int" name="decimals"/>
-        <Option value="0" type="int" name="rounding_type"/>
-        <Option value="false" type="bool" name="show_leading_degree_zeros"/>
-        <Option value="false" type="bool" name="show_leading_zeros"/>
-        <Option value="false" type="bool" name="show_plus"/>
-        <Option value="false" type="bool" name="show_suffix"/>
-        <Option value="true" type="bool" name="show_thousand_separator"/>
-        <Option value="false" type="bool" name="show_trailing_zeros"/>
-        <Option value="" type="QChar" name="thousand_separator"/>
+        <Option type="QString" value="DecimalDegrees" name="angle_format"/>
+        <Option type="QChar" value="" name="decimal_separator"/>
+        <Option type="int" value="6" name="decimals"/>
+        <Option type="int" value="0" name="rounding_type"/>
+        <Option type="bool" value="false" name="show_leading_degree_zeros"/>
+        <Option type="bool" value="false" name="show_leading_zeros"/>
+        <Option type="bool" value="false" name="show_plus"/>
+        <Option type="bool" value="false" name="show_suffix"/>
+        <Option type="bool" value="true" name="show_thousand_separator"/>
+        <Option type="bool" value="false" name="show_trailing_zeros"/>
+        <Option type="QChar" value="" name="thousand_separator"/>
       </Option>
     </GeographicCoordinateFormat>
   </ProjectDisplaySettings>
diff --git a/GIS Base Map/all_routes.dbf b/GIS Base Map/all_routes.dbf
index 51071039396c98bc88d436f83b6b245d3b93b9da..50eb2fecdf73b3f97f60908317fa7b384469bda8 100644
GIT binary patch
delta 13
UcmZ1^wn&VHxr&o*Ba0k202m$u-v9sr

delta 13
UcmZ1^wn&VHxr&ozBa0k202mYk-2eap

diff --git a/GIS Base Map/all_routes.shp b/GIS Base Map/all_routes.shp
index f7a45873d96d8e7e23a2ba12a058427585833f2f..ab8fa9ac267e239e85a90d1b972cc3293a76df05 100644
GIT binary patch
delta 3368
zcmYk<c{o*D9|v&9ShyLIF~u<!Nk@h<bSN3(s*5faMTM(gHzXO4N=k;zg_4YscsZuJ
z(GkK;*H99v3>gzLN9z5q=Xrac```Ke_HVDV&)R!`*E$K2l#fZ27)f@8lGyb!oI#l%
zB4X((lryoX*Z)EwGec)l*x1-k#U?f|X7ad3{ak5u-+9MR3OFDo^J1ef99jG{Odh6+
zEr`0n6IGNZa-#aHmb*^y&w<Wvr;HfEs&s8Wa=z?>D=!`PaF7vEgmtR4U6kPlk2~@j
zu;40<WEnW|XtJo*44uJpnyulMLg8WYvt(^Fd<g2fnBhXB4{1pqHG{u6TGb@ON;aHs
z=CFHB_Q_Z{OfPSq_}bAgYN2p@Kt(Mvr@TQ59e%>Q5=@6hxr*Ot!|XemPP^dIZk`bp
zIJL56*<gl2XN9bi6qZ9l*JMu!Y0ytmOqPIuo$59u1AMo7@sbZtO3*aj4O?`DF8nx2
zqo)gT_nE*{VdnlNIOKj(!algs@}AEe+@LRCvmZWC-6!$|4h&H|>;fBDDzy&50{saS
z_ZTS5B>k8iM8VI#bMiiHl%Y3V2Tw1}RlR}3+NPUo;kR4rO?%)AMK8GOVHz7x?R(fW
z>Ym{<IMTRzT|X?#9D2|MAJTfpGYFTg2<A5vm+{36!CG1#&24bmrHU4&4o4_EL)wC~
z>N6^@D^wOH&|yDonlT1zYEKA_!xw+eNEwGON*&-OBdGO8+4EpZzB<(!m&0M7&utZf
zCk!+;Wxx-rM|X<Bx7WHV+=eH#g2gw$b$KQR39z+CrP5|Nuc-C?74i^N`50{_H_eAO
z+~kRd^77eI6IfFrB*+7H5cV5#gHw;k2%mswcNe_B23I%oZu5oR+_#1C;UVgtbI|z<
z9y@f%Py&|pm|pi34mo>p>IvMWRQQB4OJ_Yc9~a?sqtTzc&wuM94}oU2njmSosq55V
zjT6l0Rkl2anX-ii74Vt;XNSw+y-K&eO5qtR-5bP;chn5>;B&uiQ>}qLm-5ZBU=QAv
zx+Zv`MV*=nd;aIunpU`;wOJ$w#_Pw<#>U;tfe(`MyC)|fIML|#e+;EJ&Cyw(%uely
zbf?h=i}&bL(M(>}E~Y+D1%=VVlawBTL%j@v3uK(1tw+*FcIU&s{L+Ibaa_>jrU$t*
zi>LfwYr<It#$W4Uoyg41GH|PBg~SUuv+iD^I2_FD=hz1K1wXP`3rA2_s@mZNSNm0b
zusCBj{w29n^K&|<zW+g^d#hLrbfTeT#NhN0JZN|6G<g`=XOrjJ;7@azLIbdzt-MMp
z++v}uGXh6nk50>iop1Mde1h3%eG+l7hP`w76s)Py)qM@V)XH5w4S$e~`aJ;dyw%mZ
zFtd@)3g)rkazUZHdvNdv8crw0vJS)FuT<;vFok$uaxj*+e^UJi^T`T2VD}93DK`+^
zTLTvvY8aFGeN6TESpKj17Q3grsTd9$?y_jWamoMRkMZR_oOSS5>*Vqh9Ori~-Oqwu
z%w_2nuw9k<k-y-w<1+5ma7?0tS>YTeNyhZ8L_G?b1A<z4Xb|&d)sqVfObr#whK~&x
zSiOa{f7pg)z#l!N+6G};>&3-%_*cW#xf3vjGtQ7WaQ0^CSNKGb8I5?S=w~4gXBypW
zLuoMaqPF23ez<aX)3>{GTM>fZ2?wQ7m^6qo%tAwG_iK4o_=b&lZ4T@o(lMX~J611O
z<TCqyv1Vs<wr5=;F;=vY%|_-mG?6c70bXx(-gpk~&3w{11*=P#Z=8fx&)LqCOvpVT
zXhkxjLxg&A0#5zicpu3Kj!z*etMH1xU(2pi35UMTvlWGXuDe;0jF>(o-b`ZF!E=i{
zGJ?TMvN(|<gTin~y*CMo_m%x}Tj0Z|RXY(9thAdCTZ~{kSCu_paAjjnv@u-N=-6=v
zUY5Pr?+V8oQ^HTeRZl1n!r_to=A!4}V!2D#(qaGhRJl-i!lv-ZE%?w(LrxgUfW>n!
zWl~X?IW@r`UwC!!Mk`r)n*4p2ufh%dRD+vv#OrqtufgjaS3V}f`;{}-UWZ>bEj7l&
z-7h_|li-Q8-<dJ+p(SNj3jFP(s7eG}*7zhT4Nl+up!5=4{daHQU9u2J-D#!ykpZSm
z^m1YPrf!-ioT^yLDulZq*5-J?=VX_?%3$FJn|k8Ao=omXaOVcWUebRscF2?kPw4Hd
zKL@8s$4ir!Kj)Z;Q4s8MIfvQ=+jSn<KxT+%vA~V-4+=@L<pW75ys-XWMbcnMB*#4)
zw%s_e4R1dydb;S(V)$~rrXR6Wi|fsY@UcqS)x_rP+HzH}*H~HwNe{0I-KjeGtoP+C
zGTu93L1r_|@29_}6|NCD|KHazcR&ear5T0p6qP+6Q1~;RIZ3XthbL>gAFi8DJ>Ccx
z*=Y{2BSu5-$S#usbYkPUR>4Eu{KDh{29s}e%E3xsGPxVz+s1)|dT<;)(u7>V&vn52
znZFtb)`1bZh{QEm2cEXES182G2>G)Mvc=yLQl_jh>xFJm7~+kNgW-t36GyeG$wPaJ
zYw;;b=EH`$+eyriu|h4P;4M2}q>?)}s-1Q;8uqkYM<+}9Z;$VfQsMBO9W^9wRnKmG
zz5#Z3uy7{VZ?HrDxg=a3Ef+&3Y=w3GGl}0fJ&)et_b^z(vZkf{D4g6;QuqoDbY-gL
zYWUsJq|^>rFK?-K3F#N*mu}ew?<tf_CUNYm^344MJS7~F-wrD+29}aIrlh8ov*598
zBeP++JK^w98BEjvsyhmMS>E`Z3wwI)-#$LGi_Th;6z>{~!neTD;V)<qOJ(W>!G8o;
zX)eN7L)WLd!}`z5N7*o=!YTP~$KbtB(i6Fv;UbqL7*)rQs*&A=y$?qkNe=N*RqtU~
z!1QVUXIQo8bVLs<GR#*n2Adq*aQ7uF6DQ_CmW--|?${RCcgB2zBuj93wKLhz^o1>N
zA^V$0+c-?gey8h4xH|cb7a!P(Hp10=Q$zd6B)(Y_nM*cE^6eX~$fQKsooFB%s1(7T
zU2ow{tKXT7!ZyLR406}lv-`)0>r1Vd$s)@a<Y+ew53TJ?A-j)#SN*S$Xw3I=(>(wS
z^lE01=)6i>6=w-k<Q&Av4zZK}Zv}IbEX(6_;aqr(Ti5JbXM%>Do@O@z*xXhrU^jfw
z(Dalv+{TQj8^TU1u_X%d&n@T&!zMvhc-?@R9NCiY3OFyI`7ggx<Z>~D1K;kwMb6KS
z%nUGv=ecTXjYzVjXX;j5K*4s`nWy{Uk+7H6*WoIbwXy|#U%Hv|HmvwuI)EHkrfP?i
z7r!7q)0%9mJ7kKb$$qLzou9e`7QddAM1`r3W5%(IXN~szw5z~uf$F<8;A38T8tQNg
zzhnhN9R+8R18WUYSbiurrU<)*&uJOM5z0Nu3b3MX?BC>X#bu`UIaydL=CZ^IxSG|N
zK>T^TQ@sz|%eKjY^#8CCN+Ew!Mg=b@lkr$xdY)I{0(ON$a)EK$^MR3YaqJcL6`lAd
XwHf~HdU<-UQ0nk@-pOp-Y9abRtE6Kj

delta 1999
zcmXxlc|4SP90%|@NREgiqlrXK>7a3ybv&g*nYM#gZ0i`w*utt5Elr0mFXb3%u~NCE
zgNahHgJLDgQRF71i!?}~-Oq1d+kf-^{=W0f^E|)L_cuLp^w<b`lomrzA(}l`#yMks
zRW!Ajz9o7ud)gP*z3RGBN<yd6Xx`BmDuf=lYkmm!=2DsCWwG<Iz_5Ik?gbxEt6oGJ
z{kq&G9`N@sW@b7V+QLo#8m*+?{nU{O12|NYQpklT7n*Kd0B^4^^*4c+Z=A~2g_CJA
zo@THrJCHvc4w|9IS|O!`lF*YK@>h0qsp1y}mK)LF=EIs95A%#~sM*8RCI{_kcm;j=
zF5+daf4n>eSM(`!h~r}z8*Si|bVectk1k3Qn8W$sENX1v*5v^U7Q?5)`%e?6?0gWW
z3y-BLJhG7rDT!<A_;M{2_SJ;FCl{z%ZJDnK2UV*~+QQ*|>KZiIepPR-9c*!bgW9+k
zmy%ZZtmDBZ>(T~BVQuZC<}I*Vh1|`4*to<xJ`3jkBE0t+b_zdfm;;wSDNrtlt2xSL
zO>QVm@Rw;lLP7S@vF)w!v76Ph#9W$OSv!2j%!XM3SG@9%>w;JA4E28uZ(EiS(*x&C
zPS1V<yW}fI^}!yh$1UsN9VylY;vLK|hHw=}bLjvoTfMG{2hbs(;yeBxc8yQk`VQ9L
zxif>TPi-rHN3LM<^;D)T9=YXJlxq>3)9e(i2Ft&wv(AK*6!T`X;9{rKElIHW@|0;h
za6<Nt6LGMO*fD~<bM4YxtFvU2-2)8yYfuO@xbGN%1{Z}*0Rs50mdO<_IQrh_Zztie
zQiqU(ux69POD&|NF+5nW48Cn-_(1}*&Z_=HAEqSfE=mhk1h^rmZdNzeIf7wkDb}YK
z^;;Cfrg>ed#jso5`jG;%$v-O@xZOqJQ={2^F&Zj|d?N0^-HD4nl1)n3Z0|`f;NCvV
zI1P5}3SL|Zd;Vo^l?p2cM3+2;6OM}N(_xGcgGQ63nD~&yiAdhW=That?WWg9uwMlw
z)n|X@QoXrrtmdJYE`z2taj4uKy72qjx(7<y<adl6Mkh|AS6`e_o&kq=Tk3nl8YTKy
z$$ge+Z#Oc7=ilG2Qwr;!SGSr&)&~#NR>EtNnFFfuUVZPzD!9Gwl7|vJx8QEW6S%5A
zHhwDnvHRY^8nP4PTXtlR`*5k?BOR+7&~V4r_1Y`=-8GfVEwJ3?LX#SJ$j)eOCtPx3
z*P?tlsJh&s7Z$y}-gX5ReDsrl1IwPHIY+`Pa|YggfGy6CvChC}^+ZF1a8F=PToBwg
z=p{2E)uAK}`v)I+q96*bxjTu5%C%WTPH^;l1AQ6sR)u<|*imH*Lukki+C#=Hjw74!
z4SmBMU$efzc^lZVBXCIVLnax^F^#m2Pw>O=7IQsVp^JJz)^$7mPLmAwy*bJlh3(A~
zIX<xMuGZbe>(-P>!e9-b0lQ&%&xy^wy|8<TSuJM5SCZ{fTQH2m>^xodw`dqVwyH@E
z5pXKB>?cEV%h|APD!ijzW|E9)ZdkLe9_-i_IggC7{=*bmYuH*tujLsW*{L;3GW?t0
zxg3&V<!zcC(~#l1c3Y0<^31~w6-^OaeIdP5yjJ}pT^KSU&kM)SUFwT(xr(nJYASs}
zytLk2jU>`1y+oZjcqoiVl5<$?V&ECLY`)tqGNS^q$de5_1ebq$413;tE}8-J=hBl&
zGDc?D@KxYWyRXjG@P*{8Aw~FkV4BN+N%@C&+(8b7e!ZfcS~RSZ(PEB~jeD}>*b8`r
zyhRg9PUw+sm&o&u_-4N$$ysVI-%pY=WwdCd2>v+sG=v;eg;s9YZ^J8gIWfumJCs?l
zBn>|FsMVV!X~s}q`gxe~EO7Rq)R2;}N9%q+jDr8u76IAOp5nDC0(heI^`{9qu1h)9
z8TRot{ZU5D(mcTu$_+2LMGiK$QK2?TAA>zH`4*lZp=3-Bx}Wy&^WVW2OaHt<?m;ly
zC5nW|G&6A}886n+=P}A~$ez?nax7@ob}(kaM&psP<e-~la)&nurssAiUVvl&|MLmT
zqP6XlQr40)`*kc<qoI-KtVs?!UV|FPA0AA3R>g-i9uM&M!_Bisnmu5@-oL+uBNUB$
b6Ma{TSSC`XzRv>H22^5}j#FYyQ=Z1Z+r_$$

diff --git a/GIS Base Map/all_routes.shx b/GIS Base Map/all_routes.shx
index 3058a2baeee1264623c2dde1727ddfd4cbd95424..b291c44a196e27176002fec8c9162723ebdc087a 100644
GIT binary patch
delta 40
vcmZo+Y+;;W!&1BWe)mKNZOH-#2Igf93~Ub=7`VC^7z7v?7^M0b7`PPx=h6u9

delta 40
vcmZo+Y+;;W!xFjN{q#f!ZOH%z2Ie*f237|K298q<4Ez!d4C2oi7`PPx&Flz4

diff --git a/GIS Base Map/water_tables.dbf b/GIS Base Map/water_tables.dbf
index c5da9f20f41fc287312eaaa31c9b5324f63c3299..8ae836adaf8872a2be12045049056ef90303209e 100644
GIT binary patch
literal 901
zcmZRMXP07UU|=}NkP0L*L1qeE%n!ukf^#8^lEkE()cE4m5(WlmkcbGHd`@CgY7RsU
zEU$qkUzC`fT8t!*u0JKQ5~c&I{k#frU~CL$A{gNaCSI12p|>wi1x5%N6B7g*&Z4#@
zhK6vX5e#ZuVua)?xGmJS#MBgSG=f2GOUx*-#Lxh5#B0HU8Nvf_7O_4FDN4-Df$KtJ
H7)k*E^S*6r

delta 116
zcmZo=|Ha15T+YSF!N9<<kRf^^_tc38xF=6#jAB+WGMxBOec}g^$+?WO%nHUvlM|U7
wCNnZiGMN|ynGsA1rjrdBBPSnbvV*8FHv<Y=162T3TbP5`qNd)y3g|!z0RMy=r2qf`

diff --git a/GIS Base Map/water_tables.shp b/GIS Base Map/water_tables.shp
index 092d061cc8bea388657c1aa40aebc733bd1e11e9..8f62d5ba04cdba2d89350230d2e17398ea0246a1 100644
GIT binary patch
literal 1052
zcmZQzQ0HR63Yhp_Ff%Z)0_9qKO|ldcj2ygn{1<Hh;cy`6Q<iXHwvj`Q#NPj2UmXr$
z)s8C22;@3|%sREuqq+=eRz+;LrS5l!19@`-gKB{M_LpfI>Oek7AxIqv%+{RmRE{JE
zQ=4bysRYtHN91=`HIi8{vv)@R_XL@Rt{-S56A**lf$pcRPo}KV1DbV5eZi9kpdXRl
z;Z>fHtO%5Y`5&ftMubme8&K^piOG$+NP1yrF>a}eZUoAs>j%047_ty|^c>hXI}I3?
z-8Zi*_yWTcJ#3NP0aJTj;@MjtpxQK*7Y7TF;sK_2;^zzb-az@kw;tR;HXB_(&<!jw
zcQnp=64{kx<gh+NO=%%eud4C(Ni%@_0}+|?=K%T0?yyKTaYUAbsa^HC@gGQS;+%aC
zk<Egcy+7UZ-U6UJx_+P=Kv52kmkk$gpV*ja<ZzBP<^Fb{+C8g7E^Y<#b@t5`+l1zh
zZ;of~Y(bKPsa1_QZU|CayTD@6CM2`a%|_P`bORgA9WPow2kr#wbzlBnau?97+sCDj
z?*;OY#)h8UjOGsMBWc_BAj!eh?*HEK1f+J6(&d_6K=}X%vyVH0d~~zX^#k3&4s%EQ
z?nR{^QjHw0-Rq2f0@S-8>4^ImAm59-vg8q(J78+(Ui@JPQfn>ZedRNfTA1GYr}Gzp
O^nS|!a2DBYbo~H&tfZ^}

literal 1204
zcmZQzQ0HR63Yel^Ff%Z)0_9qKO|ldcj2ygn{1<Hh;c(!7Oniu9wvoe0y`xJMzBnAf
zsvT935y<rbnYBiFk&`G;Z|<COn}a~TFtei9if!Bn<bxElLG{AqirE^>_XFknEiCpU
z>xG$hKqK|Q0iZnlvd>EufM&zYLf4PZ2U^1f#10^Ly|mST!4K5CQX)I`D9|jGiLsg>
zvmPyQ)j9-q7f2llz|;y{X1sp{DCfTV&SZHcwJ^ON!K)^M^j>bf<t>0@HoAVGk-(6K
zxa0O|hV?sBjU0NnuC3Ds>V5OYRQ&{y4-0Eh_`uu&le-%zBBljYJJDkEj)O>gVP@$G
zO@FEgl+Qb}^V5DLv(WVejb?$l<J3Zr>M~%QSHyN(>V606of8;T1LU{AOw&*Y@{!#!
zTXVisIg%VqZJw2<5=ieHk>6d_NM^yz-WmDd6J!>;eyA70@q(WAwmzA%Mh|G#9rXoI
z8h~jL*&SZx3CW5;IaoS{>75bb)7S=7`%7YSqb`zOm|2WlYN8u~^62`3?f@l4usgh)
zzDE5>GIBVrS>&Se)!~4_9H|}uf&Amg1r(Kld}Mco-=AXh8%ZrpZ*Er48g-!B1HJ$D
z{6W$SGb^(4*>#Xv==y<fV28QmSp5e1H$c5Vk8b+r2UL4pQ9biLkiWayLct5o9Wc2}
z+eua+xsN<z?~wJv%xax}=qkvpSyK+qdWU2dx_+P=IAHF0aJqAYRECj*ltzl03NUTG
u5K#T<1LT`I+&Ba(6Oh9LrgnWu$vP!0YGHa0&$jgh$)~@Ge}!x|x_$ud^T9Fz

diff --git a/GIS Base Map/water_tables.shx b/GIS Base Map/water_tables.shx
index aad948137594396d5e24a1b6c4af250be0645f8d..7db94036f6594d6bb7f31eb1e8b52d6229c4e30e 100644
GIT binary patch
literal 156
zcmZQzQ0HR64*Xs)Gcd3M<yw4AvJ?`G9K3e?7i|CGa3JVYmT+OVkwcEe-v3@-9S&gE
djv{IV<T(Iw8I;}yrT;-_MkgrU2BlAdXaFfb6{P?G

literal 164
zcmZQzQ0HR64uW1VGcd3M<yw4AvJ?`G9K3e?7i|CGaNvGSe28MUk;6&7qe~RNI2^#P
j9Yxd#$nyZ=Iv{oc;zJOckqt_FLFqmyeF;J{iGgSUt6LQe